diff --git a/hwe/sammo/API/General/BuildNationCandidate.php b/hwe/sammo/API/General/BuildNationCandidate.php index 5a4b2d1b..8d32e5ae 100644 --- a/hwe/sammo/API/General/BuildNationCandidate.php +++ b/hwe/sammo/API/General/BuildNationCandidate.php @@ -90,6 +90,10 @@ class BuildNationCandidate extends \sammo\BaseAPI return '거병을 실패했습니다.'; } + if ($general->getNPCType() < 2){ + $general->setVar('killturn', $env['killturn']); + } + return null; } } diff --git a/hwe/sammo/GeneralAI.php b/hwe/sammo/GeneralAI.php index 0b904e00..6bff6e6a 100644 --- a/hwe/sammo/GeneralAI.php +++ b/hwe/sammo/GeneralAI.php @@ -3438,10 +3438,12 @@ class GeneralAI $cmd = buildGeneralCommandClass($this->rng->choice($candidate), $this->general, $this->env); - if (!$cmd->hasFullConditionMet()) { - return buildGeneralCommandClass('che_물자조달', $this->general, $this->env); - } - return $cmd; + if ($cmd->hasFullConditionMet()) return $cmd; + + $cmd = buildGeneralCommandClass('che_물자조달', $this->general, $this->env); + if ($cmd->hasFullConditionMet()) return $cmd; + + return buildGeneralCommandClass('che_견문', $this->general, $this->env); } protected function categorizeNationCities(): void