From 375b08be873304955b7b692e61dc5baf362ef0f2 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 16 Nov 2021 20:45:16 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20NPC=EC=A0=95=EC=B1=85=20=EC=B5=9C?=
 =?UTF-8?q?=EB=8C=80=20=ED=8F=AC=EC=83=81=EB=9F=89=20=EC=A7=80=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/AutorunNationPolicy.php | 2 ++
 hwe/sammo/GeneralAI.php           | 4 ++--
 hwe/ts/NPCControl.vue             | 8 ++++++++
 hwe/ts/defs.ts                    | 1 +
 hwe/v_NPCControl.php              | 4 ++--
 5 files changed, 15 insertions(+), 4 deletions(-)

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="포상/몰수/헌납/삼/팜 최소 단위"
           >연산결과가 이 단위보다 적다면 수행하지 않습니다.</NumberInputWithInfo
         >
+      </div>
+        <div class="col">
+        <NumberInputWithInfo
+          v-model="nationPolicy.maximumResourceActionAmount"
+          :step="100"
+          title="포상/몰수/헌납/삼/팜 최대 단위"
+          >연산결과가 이 단위보다 크다면, 이 값에 맞춥니다.</NumberInputWithInfo
+        >
       </div>
       <div class="col">
         <NumberInputWithInfo
diff --git a/hwe/ts/defs.ts b/hwe/ts/defs.ts
index 6913eaa3..d268f188 100644
--- a/hwe/ts/defs.ts
+++ b/hwe/ts/defs.ts
@@ -125,6 +125,7 @@ export type NationPolicy = {
     reqNPCDevelGold: number,
     reqNPCDevelRice: number,
     minimumResourceActionAmount: number,
+    maximumResourceActionAmount: number,
     minNPCWarLeadership: number,
     minWarCrew: number,
     minNPCRecruitCityPopulation: number,
diff --git a/hwe/v_NPCControl.php b/hwe/v_NPCControl.php
index 85d40a82..bf0058b9 100644
--- a/hwe/v_NPCControl.php
+++ b/hwe/v_NPCControl.php
@@ -63,8 +63,8 @@ if ($currentNationPolicy['reqHumanWarUrgentRice'] ?? 0) {
 if ($currentNationPolicy['reqHumanWarUrgentGold'] ?? 0) {
     $autoPolicyVariable['reqHumanWarUrgentGold'] = $currentNationPolicy['reqHumanWarUrgentGold'];
 }
-$autoPolicy = new AutorunNationPolicy($general, ($gameStor->autorun_user)['options'], ['values' => $autoPolicyVariable], null, $nation, $gameStor->getAll(true));
-$zeroPolicy = new AutorunNationPolicy($general, ($gameStor->autorun_user)['options'], null, null, $nation, $gameStor->getAll(true));
+$autoPolicy = new AutorunNationPolicy($general, ($gameStor->autorun_user)['options']??[], ['values' => $autoPolicyVariable], null, $nation, $gameStor->getAll(true));
+$zeroPolicy = new AutorunNationPolicy($general, ($gameStor->autorun_user)['options']??[], null, null, $nation, $gameStor->getAll(true));
 
 $lastSetters = [
     'policy' => [