From 08d483af8a75bd1998cf44a822e03f5968d04f6c Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 10 Apr 2021 16:01:21 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=ED=9B=84=EB=B0=A9=20=EC=9B=8C=ED=94=84?=
 =?UTF-8?q?=20=EC=9D=B8=EA=B5=AC=20=EC=B6=A9=EB=B6=84=20=ED=8C=90=EB=8B=A8?=
 =?UTF-8?q?=20=EA=B8=B0=EC=A4=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/GeneralAI.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/hwe/sammo/GeneralAI.php b/hwe/sammo/GeneralAI.php
index b4c725b8..29b679b6 100644
--- a/hwe/sammo/GeneralAI.php
+++ b/hwe/sammo/GeneralAI.php
@@ -659,7 +659,10 @@ class GeneralAI
 
         /** @var General */
         $pickedGeneral = Util::choiceRandom($generalCadidates);
-        $minRecruitPop = $pickedGeneral->getLeadership(false) * 100 + GameConst::$minAvailableRecruitPop;
+        $minRecruitPop = $this->fullLeadership * 100 + GameConst::$minAvailableRecruitPop;
+        if(!$this->generalPolicy->can한계징병){
+            $minRecruitPop = max($minRecruitPop, $this->fullLeadership * 100 + $this->nationPolicy->minNPCRecruitCityPopulation);
+        }
 
         $recruitableCityList = [];
 
@@ -955,7 +958,10 @@ class GeneralAI
 
         /** @var General */
         $pickedGeneral = Util::choiceRandom($generalCadidates);
-        $minRecruitPop = $pickedGeneral->getLeadership(false) * 100 + GameConst::$minAvailableRecruitPop;
+        $minRecruitPop = $this->fullLeadership * 100 + GameConst::$minAvailableRecruitPop;
+        if(!$this->generalPolicy->can한계징병){
+            $minRecruitPop = max($minRecruitPop, $this->fullLeadership * 100 + $this->nationPolicy->minNPCRecruitCityPopulation);
+        }
 
         $recruitableCityList = [];
 
@@ -2734,6 +2740,9 @@ class GeneralAI
     protected function do후방워프(): ?GeneralCommand
     {
         $minRecruitPop = $this->fullLeadership * 100 + GameConst::$minAvailableRecruitPop;
+        if(!$this->generalPolicy->can한계징병){
+            $minRecruitPop = max($minRecruitPop, $this->fullLeadership * 100 + $this->nationPolicy->minNPCRecruitCityPopulation);
+        }
         if (in_array($this->dipState, [self::d평화, self::d선포])) {
             LogText("{$this->general->getName()}, {$this->general->getID()} 후방워프 불가: 외교 상태", $this->dipState);
             return null;