diff --git a/hwe/sammo/AutorunNationPolicy.php b/hwe/sammo/AutorunNationPolicy.php index af2d3b10..add789ce 100644 --- a/hwe/sammo/AutorunNationPolicy.php +++ b/hwe/sammo/AutorunNationPolicy.php @@ -137,6 +137,7 @@ class AutorunNationPolicy { public $reqNPCDevelRice = 500; public $minimumResourceActionAmount = 1000; + public $maximumResourceActionAmount = 10000; public $minNPCWarLeadership = 40; public $minWarCrew = 1500; @@ -164,6 +165,7 @@ class AutorunNationPolicy { 'reqNPCDevelRice'=>500, 'minimumResourceActionAmount'=>1000, + 'maximumResourceActionAmount'=>10000, 'minNPCWarLeadership'=>40, 'minWarCrew'=>1500, diff --git a/hwe/sammo/GeneralAI.php b/hwe/sammo/GeneralAI.php index de87d778..3cf8be1f 100644 --- a/hwe/sammo/GeneralAI.php +++ b/hwe/sammo/GeneralAI.php @@ -121,14 +121,14 @@ class GeneralAI $prevIncomeGold = $nationStor->prev_income_gold ?? 1000; $prevIncomeRice = $nationStor->prev_income_rice ?? 1000; - $this->maxResourceActionAmount = Util::round(max( + $this->maxResourceActionAmount = Util::valueFit(Util::round(max( $this->nationPolicy->minimumResourceActionAmount, $prevIncomeGold / 10, $prevIncomeRice / 10, $this->nation['gold'] / 5, $this->nation['rice'] / 5, ($this->env['year'] - $this->env['startyear'] - 3) * 1000 - ), -2); + ), -2), null, $this->nationPolicy->maximumResourceActionAmount); if ($this->maxResourceActionAmount > GameConst::$maxResourceActionAmount) { $this->maxResourceActionAmount = GameConst::$maxResourceActionAmount; } diff --git a/hwe/ts/NPCControl.vue b/hwe/ts/NPCControl.vue index 3d378143..45cc570b 100644 --- a/hwe/ts/NPCControl.vue +++ b/hwe/ts/NPCControl.vue @@ -154,6 +154,14 @@ title="포상/몰수/헌납/삼/팜 최소 단위" >연산결과가 이 단위보다 적다면 수행하지 않습니다. + +