From bc4983c77192cac77b9d66411adad97ca1f6fb56 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 13 Sep 2018 02:10:37 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A0=84=EB=9E=B5=20=EA=B4=80=EB=A0=A8=20?=
 =?UTF-8?q?=EB=B3=B4=EC=A0=95=20=ED=95=A8=EC=88=98=20=EB=AA=85=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/DefaultActionTrigger.php         | 6 +++---
 hwe/sammo/TriggerNationType/che_음양가.php | 7 +++++--
 hwe/sammo/TriggerNationType/che_종횡가.php | 7 +++++--
 hwe/sammo/iActionTrigger.php               | 2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/hwe/sammo/DefaultActionTrigger.php b/hwe/sammo/DefaultActionTrigger.php
index 9b767ca1..03bf5cfc 100644
--- a/hwe/sammo/DefaultActionTrigger.php
+++ b/hwe/sammo/DefaultActionTrigger.php
@@ -12,9 +12,9 @@ trait DefaultActionTrigger{
     public function onPreGeneralStatUpdate(General $general, string $statName, $value){
         return $value;
     }
-    
-    public function onCalcStragicDelay(array $nation, int $commandType, int $turn):int{
-        return $turn;
+
+    public function onCalcStrategic(string $turnType, string $varType, $value){
+        return $value;
     }
 
     public function onCalcNationalIncome(string $type, int $amount):int{
diff --git a/hwe/sammo/TriggerNationType/che_음양가.php b/hwe/sammo/TriggerNationType/che_음양가.php
index 3834e8a9..f63ec8bc 100644
--- a/hwe/sammo/TriggerNationType/che_음양가.php
+++ b/hwe/sammo/TriggerNationType/che_음양가.php
@@ -33,7 +33,10 @@ class che_음양가 implements iActionTrigger{
         return $amount;
     }
 
-    public function onCalcStragicDelay(array $nation, int $commandType, int $turn):int{
-        return $turn * 2;
+    public function onCalcStrategic(string $turnType, string $varType, $value){
+        if($varType == 'delay'){
+            return $value * 2;
+        }
+        return $value;
     }
 }
\ No newline at end of file
diff --git a/hwe/sammo/TriggerNationType/che_종횡가.php b/hwe/sammo/TriggerNationType/che_종횡가.php
index 3fa83c3b..850ce3ea 100644
--- a/hwe/sammo/TriggerNationType/che_종횡가.php
+++ b/hwe/sammo/TriggerNationType/che_종횡가.php
@@ -33,7 +33,10 @@ class che_종횡가 implements iActionTrigger{
         return $amount;
     }
 
-    public function onCalcStragicDelay(array $nation, int $commandType, int $turn):int{
-        return Util::round($turn / 2);
+    public function onCalcStrategic(string $turnType, string $varType, $value){
+        if($varType == 'delay'){
+            return Util::round($value / 2);
+        }
+        return $value;
     }
 }
\ No newline at end of file
diff --git a/hwe/sammo/iActionTrigger.php b/hwe/sammo/iActionTrigger.php
index 1ea18ef3..c8ad9b77 100644
--- a/hwe/sammo/iActionTrigger.php
+++ b/hwe/sammo/iActionTrigger.php
@@ -15,7 +15,7 @@ interface iActionTrigger{
 
     public function onPreGeneralStatUpdate(General $general, string $statName, $value);
 
-    public function onCalcStragicDelay(array $nation, int $commandType, int $turn):int;
+    public function onCalcStrategic(string $turnType, string $varType, $value);
     public function onCalcNationalIncome(string $type, int $amount):int;
 
     public function getWarPowerMultiplier(WarUnit $unit):array;