From b9befa4e6304d5354cb677532b9f36cd36937b46 Mon Sep 17 00:00:00 2001 From: hide_d Date: Sun, 2 Sep 2018 23:02:12 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B5=AD=EA=B0=80=20=EC=84=B1=ED=96=A5=20?= =?UTF-8?q?=EC=A6=9D=EA=B0=80/=EA=B0=90=EC=86=8C=20=EA=B8=B0=EB=B3=B8=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/sammo/TriggerNationType/che_덕가.php | 5 ++++- hwe/sammo/TriggerNationType/che_도가.php | 8 ++++++++ hwe/sammo/TriggerNationType/che_명가.php | 5 ++++- hwe/sammo/TriggerNationType/che_법가.php | 5 ++++- hwe/sammo/TriggerNationType/che_병가.php | 10 +++++++++- hwe/sammo/TriggerNationType/che_오두미도.php | 13 ++++++++----- hwe/sammo/TriggerNationType/che_음양가.php | 10 +++++++++- hwe/sammo/TriggerNationType/che_태평도.php | 8 ++++++++ 8 files changed, 54 insertions(+), 10 deletions(-) diff --git a/hwe/sammo/TriggerNationType/che_덕가.php b/hwe/sammo/TriggerNationType/che_덕가.php index 2a579ab5..e9d75179 100644 --- a/hwe/sammo/TriggerNationType/che_덕가.php +++ b/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; } diff --git a/hwe/sammo/TriggerNationType/che_도가.php b/hwe/sammo/TriggerNationType/che_도가.php index 08c57a6b..8a834f30 100644 --- a/hwe/sammo/TriggerNationType/che_도가.php +++ b/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; + } } \ No newline at end of file diff --git a/hwe/sammo/TriggerNationType/che_명가.php b/hwe/sammo/TriggerNationType/che_명가.php index ef988447..6941aeb4 100644 --- a/hwe/sammo/TriggerNationType/che_명가.php +++ b/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; } diff --git a/hwe/sammo/TriggerNationType/che_법가.php b/hwe/sammo/TriggerNationType/che_법가.php index b7bcf243..bd2e678b 100644 --- a/hwe/sammo/TriggerNationType/che_법가.php +++ b/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; } } \ No newline at end of file diff --git a/hwe/sammo/TriggerNationType/che_병가.php b/hwe/sammo/TriggerNationType/che_병가.php index 25b8f988..6c28d491 100644 --- a/hwe/sammo/TriggerNationType/che_병가.php +++ b/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; + } } \ No newline at end of file diff --git a/hwe/sammo/TriggerNationType/che_오두미도.php b/hwe/sammo/TriggerNationType/che_오두미도.php index 380e5597..be625852 100644 --- a/hwe/sammo/TriggerNationType/che_오두미도.php +++ b/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'){ - $score *= 0.9; - $cost *= 1.2; - } - else if($turnType == 'tech'){ + 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; } diff --git a/hwe/sammo/TriggerNationType/che_음양가.php b/hwe/sammo/TriggerNationType/che_음양가.php index 62a8c81f..ef94b251 100644 --- a/hwe/sammo/TriggerNationType/che_음양가.php +++ b/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; } diff --git a/hwe/sammo/TriggerNationType/che_태평도.php b/hwe/sammo/TriggerNationType/che_태평도.php index cea7b023..9f20c4c1 100644 --- a/hwe/sammo/TriggerNationType/che_태평도.php +++ b/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; + } } \ No newline at end of file