국가 성향 증가/감소 기본 구현 완료

hwe/sammo/TriggerNationType/che_덕가.php

@@ -20,7 +20,7 @@ class che_덕가 implements iActionTrigger{
             $score *= 1.1;
             $cost *= 0.8;
         }
-        
+
         else if($turnType == 'def' || $turnType == 'wall'){
             $score *= 0.9;
             $cost *= 1.2;
@@ -33,6 +33,9 @@ class che_덕가 implements iActionTrigger{
         if($type == 'rice'){
             return $amount * 0.9;
         }
+        if($type == 'pop'){
+            return $amount * 1.2;
+        }
         
         return $amount;
     }

hwe/sammo/TriggerNationType/che_도가.php

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

hwe/sammo/TriggerNationType/che_명가.php

@@ -16,7 +16,7 @@ class che_명가 implements iActionTrigger{
             $score *= 1.1;
             $cost *= 0.8;
         }
-        
+
         else if($turnType == 'def' || $turnType == 'wall'){
             $score *= 0.9;
             $cost *= 1.2;
@@ -29,6 +29,9 @@ class che_명가 implements iActionTrigger{
         if($type == 'rice'){
             return $amount * 0.9;
         }
+        if($type == 'pop'){
+            return $amount * 1.2;
+        }
         
         return $amount;
     }

hwe/sammo/TriggerNationType/che_법가.php

@@ -29,7 +29,10 @@ class che_법가 implements iActionTrigger{
         if($type == 'gold'){
             return $amount * 1.1;
         }
-
+        if($type == 'pop'){
+            return $amount * 0.8;
+        }
+        
         return $amount;
     }
 }

hwe/sammo/TriggerNationType/che_병가.php

@@ -20,7 +20,7 @@ class che_병가 implements iActionTrigger{
             $score *= 1.1;
             $cost *= 0.8;
         }
-        
+
         else if($turnType == 'trust' || $turnType == 'pop'){
             $score *= 0.9;
             $cost *= 1.2;
@@ -28,4 +28,12 @@ class che_병가 implements iActionTrigger{
         
         return [$score, $cost, $successRate, $failRate];
     }
+
+    public function onCalcNationalIncome(string $type, int $amount):int{
+        if($type == 'pop'){
+            return $amount * 0.8;
+        }
+        
+        return $amount;
+    }
 }

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

@@ -13,11 +13,7 @@ class che_오두미도 implements iActionTrigger{
 
 
     public function onCalcDomesticTurnScore(string $turnType, float $score, float $cost, float $successRate, float $failRate):array{
-        if($turnType == 'agri' || $turnType == 'comm'){
+        if($turnType == 'tech'){
-            $score *= 0.9;
-            $cost *= 1.2;
-        }
-        else if($turnType == 'tech'){
             $score *= 0.9;
             $cost *= 1.2;
         }
@@ -25,6 +21,10 @@ class che_오두미도 implements iActionTrigger{
             $score *= 0.9;
             $cost *= 1.2;
         }
+        else if($turnType == 'agri' || $turnType == 'comm'){
+            $score *= 0.9;
+            $cost *= 1.2;
+        }
         
         return [$score, $cost, $successRate, $failRate];
     }
@@ -33,6 +33,9 @@ class che_오두미도 implements iActionTrigger{
         if($type == 'rice'){
             return $amount * 1.1;
         }
+        if($type == 'pop'){
+            return $amount * 1.2;
+        }
         
         return $amount;
     }

hwe/sammo/TriggerNationType/che_음양가.php

@@ -16,7 +16,7 @@ class che_음양가 implements iActionTrigger{
             $score *= 1.1;
             $cost *= 0.8;
         }
-        
+
         else if($turnType == 'tech'){
             $score *= 0.9;
             $cost *= 1.2;
@@ -25,6 +25,14 @@ class che_음양가 implements iActionTrigger{
         return [$score, $cost, $successRate, $failRate];
     }
 
+    public function onCalcNationalIncome(string $type, int $amount):int{
+        if($type == 'pop'){
+            return $amount * 1.2;
+        }
+        
+        return $amount;
+    }
+
     public function onCalcStragicDelay(array $nation, int $commandType, int $turn):int{
         return $turn * 2;
     }

hwe/sammo/TriggerNationType/che_태평도.php

@@ -28,4 +28,12 @@ class che_태평도 implements iActionTrigger{
         
         return [$score, $cost, $successRate, $failRate];
     }
+
+    public function onCalcNationalIncome(string $type, int $amount):int{
+        if($type == 'pop'){
+            return $amount * 1.2;
+        }
+        
+        return $amount;
+    }
 }