From 69f4d8e2c767b33197cc702416e2d697bad57a0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=8F=AC=EC=8A=A4=ED=8A=B8=EB=AA=A8=EB=8D=94=EB=8B=88?= =?UTF-8?q?=EC=A6=98?= <> Date: Fri, 29 Dec 2023 12:07:59 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=82=AC=EC=A0=84=EA=B1=B0=EB=B3=91=20?= =?UTF-8?q?=ED=9B=84=20=EA=B5=B0=EC=A3=BC=EA=B0=80=20=EC=82=AC=EB=9D=BC?= =?UTF-8?q?=EC=A7=80=EB=8A=94=20=EA=B2=BD=EC=9A=B0=EC=97=90=20=EB=8C=80?= =?UTF-8?q?=ED=95=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/sammo/API/General/BuildNationCandidate.php | 4 ++++ hwe/sammo/GeneralAI.php | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) 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