diff --git a/hwe/func_gamerule.php b/hwe/func_gamerule.php index 83d19278..0790f614 100644 --- a/hwe/func_gamerule.php +++ b/hwe/func_gamerule.php @@ -241,20 +241,20 @@ function SetNationFront($nationNo) { 'front'=>0 ], 'nation=%i', $nationNo); - if($adj3){ + if($adj1){ $db->update('city', [ - 'front'=>3, - ], 'nation=%i and city in %li', $nationNo, array_keys($adj3)); + 'front'=>1, + ], 'nation=%i and city in %li', $nationNo, array_keys($adj1)); } if($adj2){ $db->update('city', [ 'front'=>2, ], 'nation=%i and city in %li', $nationNo, array_keys($adj2)); } - if($adj1){ + if($adj3){ $db->update('city', [ - 'front'=>1, - ], 'nation=%i and city in %li', $nationNo, array_keys($adj1)); + 'front'=>3, + ], 'nation=%i and city in %li', $nationNo, array_keys($adj3)); } } diff --git a/hwe/sammo/Command/General/che_상업투자.php b/hwe/sammo/Command/General/che_상업투자.php index 174e68d3..ce4018df 100644 --- a/hwe/sammo/Command/General/che_상업투자.php +++ b/hwe/sammo/Command/General/che_상업투자.php @@ -148,7 +148,7 @@ class che_상업투자 extends Command\GeneralCommand{ $exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp); $ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded); - if($this->city['front'] == 1 && $this->nation['capital'] != $this->city['city']){ + if(in_array($this->city['front'], [1, 3]) && $this->nation['capital'] != $this->city['city']){ $score *= static::$debuffFront; }