From f5dfb8335671a5d2c1e1bb88eb0e4168ba36cded Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Mon, 25 Dec 2023 14:36:13 +0000
Subject: [PATCH] =?UTF-8?q?feat:=20=EC=9E=85=EB=8C=80=EB=8F=85=EB=A0=A5,?=
 =?UTF-8?q?=20=EB=B3=91=EC=9E=A5=EA=B8=B0=EC=A7=80=EC=9B=90=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80,=20=EA=B8=B0=ED=83=80=20=EA=B0=9C=EC=9D=B8=EC=A0=84?=
 =?UTF-8?q?=EB=9E=B5=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/ActionBuff/g65_징병비용무시.php     | 19 +++++++
 hwe/sammo/ActionBuff/g65_징병인구무시.php     | 19 +++++++
 .../Command/UserAction/g65_병장기지원.php     | 53 +++++++++++++++++++
 hwe/sammo/Command/UserAction/g65_의원소환.php |  1 -
 hwe/sammo/Command/UserAction/g65_입대독려.php | 53 +++++++++++++++++++
 hwe/sammo/Command/UserAction/g65_철야내정.php |  2 +-
 hwe/sammo/GameConstBase.php                   |  1 +
 7 files changed, 146 insertions(+), 2 deletions(-)
 create mode 100644 hwe/sammo/ActionBuff/g65_징병비용무시.php
 create mode 100644 hwe/sammo/ActionBuff/g65_징병인구무시.php
 create mode 100644 hwe/sammo/Command/UserAction/g65_병장기지원.php
 create mode 100644 hwe/sammo/Command/UserAction/g65_입대독려.php

diff --git a/hwe/sammo/ActionBuff/g65_징병비용무시.php b/hwe/sammo/ActionBuff/g65_징병비용무시.php
new file mode 100644
index 00000000..ed9c6320
--- /dev/null
+++ b/hwe/sammo/ActionBuff/g65_징병비용무시.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace sammo\ActionBuff;
+
+use \sammo\iAction;
+
+class g65_징병비용무시 implements iAction
+{
+    use \sammo\DefaultAction;
+
+    public function onCalcDomestic(string $turnType, string $varType, float $value, $aux = null): float
+    {
+        if ($varType == 'cost' && in_array($turnType, ['징병', '모병'])) {
+            return 0;
+        }
+
+        return $value;
+    }
+}
diff --git a/hwe/sammo/ActionBuff/g65_징병인구무시.php b/hwe/sammo/ActionBuff/g65_징병인구무시.php
new file mode 100644
index 00000000..74f78309
--- /dev/null
+++ b/hwe/sammo/ActionBuff/g65_징병인구무시.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace sammo\ActionBuff;
+
+use \sammo\iAction;
+
+class g65_징병인구무시 implements iAction
+{
+    use \sammo\DefaultAction;
+
+    public function onCalcDomestic(string $turnType, string $varType, float $value, $aux = null): float
+    {
+        if ($turnType == '징집인구' && $varType == 'score') {
+            return 0;
+        }
+
+        return $value;
+    }
+}
diff --git a/hwe/sammo/Command/UserAction/g65_병장기지원.php b/hwe/sammo/Command/UserAction/g65_병장기지원.php
new file mode 100644
index 00000000..57e3d0ed
--- /dev/null
+++ b/hwe/sammo/Command/UserAction/g65_병장기지원.php
@@ -0,0 +1,53 @@
+<?php
+namespace sammo\Command\UserAction;
+
+use sammo\ActionBuff\g65_징병비용무시;
+use \sammo\Command;
+
+class g65_병장기지원 extends Command\UserActionCommand{
+    static protected $actionName = '병장기지원';
+
+    protected function argTest():bool{
+        return true;
+    }
+
+    public function getBrief(): string
+    {
+        return '병장기 지원';
+    }
+
+    public function getCommandDetailTitle(): string
+    {
+        $postReqTurn = $this->getPostReqTurn();
+        return "이번턴의 징병/모병 비용 무시(재사용 대기 {$postReqTurn})";
+    }
+
+    protected function init(){
+        //아무것도 하지 않음
+        $this->fullConditionConstraints=[];
+
+    }
+
+    public function getPreReqTurn():int{
+        return 0;
+    }
+
+    public function getPostReqTurn():int{
+        return 60;
+    }
+
+    public function getCost():array{
+        return [0, 0];
+    }
+
+    public function run(\Sammo\RandUtil $rng):bool{
+        $general = $this->generalObj;
+        $general->addInstantBuff(new g65_징병비용무시(), 1);
+
+        $date = $general->getTurnTime($general::TURNTIME_HM);
+
+        $logger = $general->getLogger();
+        $logger->pushGeneralActionLog("상인에게 병사들의 병장기를 지원받습니다. <1>$date</>");
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/hwe/sammo/Command/UserAction/g65_의원소환.php b/hwe/sammo/Command/UserAction/g65_의원소환.php
index 41221053..c0e00d89 100644
--- a/hwe/sammo/Command/UserAction/g65_의원소환.php
+++ b/hwe/sammo/Command/UserAction/g65_의원소환.php
@@ -1,7 +1,6 @@
 <?php
 namespace sammo\Command\UserAction;
 
-use sammo\ActionBuff\g65_내정성공;
 use \sammo\Command;
 use sammo\DB;
 
diff --git a/hwe/sammo/Command/UserAction/g65_입대독려.php b/hwe/sammo/Command/UserAction/g65_입대독려.php
new file mode 100644
index 00000000..1592ecbb
--- /dev/null
+++ b/hwe/sammo/Command/UserAction/g65_입대독려.php
@@ -0,0 +1,53 @@
+<?php
+namespace sammo\Command\UserAction;
+
+use sammo\ActionBuff\g65_징병인구무시;
+use \sammo\Command;
+
+class g65_입대독려 extends Command\UserActionCommand{
+    static protected $actionName = '입대독려';
+
+    protected function argTest():bool{
+        return true;
+    }
+
+    public function getBrief(): string
+    {
+        return '입대 독려';
+    }
+
+    public function getCommandDetailTitle(): string
+    {
+        $postReqTurn = $this->getPostReqTurn();
+        return "이번턴의 징병/모병 인구 무시(재사용 대기 {$postReqTurn})";
+    }
+
+    protected function init(){
+        //아무것도 하지 않음
+        $this->fullConditionConstraints=[];
+
+    }
+
+    public function getPreReqTurn():int{
+        return 0;
+    }
+
+    public function getPostReqTurn():int{
+        return 60;
+    }
+
+    public function getCost():array{
+        return [0, 0];
+    }
+
+    public function run(\Sammo\RandUtil $rng):bool{
+        $general = $this->generalObj;
+        $general->addInstantBuff(new g65_징병인구무시(), 1);
+
+        $date = $general->getTurnTime($general::TURNTIME_HM);
+
+        $logger = $general->getLogger();
+        $logger->pushGeneralActionLog("성 밖의 주민들에게 입대를 요청합니다. <1>$date</>");
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/hwe/sammo/Command/UserAction/g65_철야내정.php b/hwe/sammo/Command/UserAction/g65_철야내정.php
index e4024f27..3d73969a 100644
--- a/hwe/sammo/Command/UserAction/g65_철야내정.php
+++ b/hwe/sammo/Command/UserAction/g65_철야내정.php
@@ -42,7 +42,7 @@ class g65_철야내정 extends Command\UserActionCommand{
 
     public function run(\Sammo\RandUtil $rng):bool{
         $general = $this->generalObj;
-        $general->addInstantBuff(new g65_내정성공(), 3);
+        $general->addInstantBuff(new g65_내정성공(), 2);
 
         $logger = $general->getLogger();
         $logger->pushGeneralActionLog("2턴 간 내정을 철저히 지휘합니다.");
diff --git a/hwe/sammo/GameConstBase.php b/hwe/sammo/GameConstBase.php
index af4236fd..09506aa4 100644
--- a/hwe/sammo/GameConstBase.php
+++ b/hwe/sammo/GameConstBase.php
@@ -403,6 +403,7 @@ class GameConstBase
             'g65_병사연회',
             'g65_철야내정',
             'g65_의원소환',
+            'g65_병장기지원',
         ]
     ];