금수입, 살수입 반영

hwe/sammo/DefaultActionTrigger.php

@@ -17,7 +17,7 @@ trait DefaultActionTrigger{
         return $turn;
     }
 
-    public function onCalcNationalIncome(array $nation, string $type, int $amount):int{
+    public function onCalcNationalIncome(string $type, int $amount):int{
         return $amount;
     }
 

hwe/sammo/TriggerNationType/che_덕가.php

@@ -11,5 +11,11 @@ class che_덕가 implements iActionTrigger{
     static $pros = '치안↑ 인구↑ 민심↑';
     static $cons = '쌀수입↓ 수성↓';
 
-
+    public function onCalcNationalIncome(string $type, int $amount):int{
+        if($type == 'rice'){
+            return $amount * 0.9;
+        }
+        
+        return $amount;
+    }
 }

hwe/sammo/TriggerNationType/che_도적.php

@@ -11,5 +11,11 @@ class che_도적 implements iActionTrigger{
     static $pros = '계략↑';
     static $cons = '금수입↓ 치안↓ 민심↓';
 
-
+    public function onCalcNationalIncome(string $type, int $amount):int{
+        if($type == 'gold'){
+            return $amount * 0.9;
+        }
+        
+        return $amount;
+    }
 }

hwe/sammo/TriggerNationType/che_명가.php

@@ -11,5 +11,11 @@ class che_명가 implements iActionTrigger{
     static $pros = '기술↑ 인구↑';
     static $cons = '쌀수입↓ 수성↓';
 
-
+    public function onCalcNationalIncome(string $type, int $amount):int{
+        if($type == 'rice'){
+            return $amount * 0.9;
+        }
+        
+        return $amount;
+    }
 }

hwe/sammo/TriggerNationType/che_법가.php

@@ -11,5 +11,11 @@ class che_법가 implements iActionTrigger{
     static $pros = '금수입↑ 치안↑';
     static $cons = '인구↓ 민심↓';
 
-
+    public function onCalcNationalIncome(string $type, int $amount):int{
+        if($type == 'gold'){
+            return $amount * 1.1;
+        }
+        
+        return $amount;
+    }
 }

hwe/sammo/TriggerNationType/che_불가.php

@@ -11,5 +11,11 @@ class che_불가 implements iActionTrigger{
     static $pros = '민심↑ 수성↑';
     static $cons = '금수입↓';
 
-
+    public function onCalcNationalIncome(string $type, int $amount):int{
+        if($type == 'gold'){
+            return $amount * 0.9;
+        }
+        
+        return $amount;
+    }
 }

hwe/sammo/TriggerNationType/che_오두미도.php

@@ -21,4 +21,12 @@ class che_오두미도 implements iActionTrigger{
         return [$score, $cost, $successRate, $failRate];
     }
 
+    public function onCalcNationalIncome(string $type, int $amount):int{
+        if($type == 'rice'){
+            return $amount * 1.1;
+        }
+        
+        return $amount;
+    }
+
 }

hwe/sammo/TriggerNationType/che_유가.php

@@ -19,4 +19,12 @@ class che_유가 implements iActionTrigger{
         
         return [$score, $cost, $successRate, $failRate];
     }
+
+    public function onCalcNationalIncome(string $type, int $amount):int{
+        if($type == 'rice'){
+            return $amount * 0.9;
+        }
+        
+        return $amount;
+    }
 }

hwe/sammo/TriggerNationType/che_종횡가.php

@@ -19,4 +19,12 @@ class che_종횡가 implements iActionTrigger{
         
         return [$score, $cost, $successRate, $failRate];
     }
+
+    public function onCalcNationalIncome(string $type, int $amount):int{
+        if($type == 'gold'){
+            return $amount * 0.9;
+        }
+        
+        return $amount;
+    }
 }

hwe/sammo/iActionTrigger.php

@@ -16,7 +16,7 @@ interface iActionTrigger{
     public function onPreGeneralStatUpdate(General $general, string $statName, $value);
 
     public function onCalcStragicDelay(array $nation, int $commandType, int $turn):int;
-    public function onCalcNationalIncome(array $nation, string $type, int $amount):int;
+    public function onCalcNationalIncome(string $type, int $amount):int;
 
     public function getWarPowerMultiplier(WarUnit $unit):array;
     public function getBattleInitSkillTriggerList(WarUnit $unit):array;