diff --git a/hwe/func.php b/hwe/func.php index 430b8a6e..69eb3662 100644 --- a/hwe/func.php +++ b/hwe/func.php @@ -408,14 +408,14 @@ function checkSecretPermission(array $me, $checkSecretLimit = true) } $secretMin = 0; - $secretMax = checkSecretMaxPermission($me, $penalty); + $secretMax = checkSecretMaxPermission($penalty); if ($me['officer_level'] == 12) { $secretMin = 4; - } else if ($me['permission'] == 'ambassador') { + } else if ($permission == 'ambassador') { $secretMin = 4; - } else if ($me['permission'] == 'auditor') { + } else if ($permission == 'auditor') { $secretMin = 3; } else if ($me['officer_level'] >= 5) { $secretMin = 2; diff --git a/hwe/sammo/Event/Action/RaiseInvader.php b/hwe/sammo/Event/Action/RaiseInvader.php index 00572fa6..fa2fba83 100644 --- a/hwe/sammo/Event/Action/RaiseInvader.php +++ b/hwe/sammo/Event/Action/RaiseInvader.php @@ -75,7 +75,7 @@ class RaiseInvader extends \sammo\Event\Action do { $newCapital = $rng->choice($capitalCandidates); - } while(in_array($newCapital, $cities); + } while(in_array($newCapital, $cities)); $db->update('nation', ['capital' => $newCapital], 'nation=%i', $nation); $db->update('general', ['city' => $newCapital], 'nation=%i and city=%i', $nation, $oldCapital);