From d9ed00ddee279646ab63520644d6a8b3be6c4df4 Mon Sep 17 00:00:00 2001 From: hide_d Date: Sun, 2 Sep 2018 22:50:25 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B9=98=EC=95=88,=20=EC=88=98=EC=84=B1,=20?= =?UTF-8?q?=EB=AF=BC=EC=8B=AC=EA=B9=8C=EC=A7=80=20=EB=B0=98=EC=98=81=20?= =?UTF-8?q?=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 | 18 +++++++++++++++ hwe/sammo/TriggerNationType/che_도가.php | 4 ++++ hwe/sammo/TriggerNationType/che_도적.php | 13 +++++++++++ hwe/sammo/TriggerNationType/che_명가.php | 23 ++++++++++++-------- hwe/sammo/TriggerNationType/che_묵가.php | 7 +++++- hwe/sammo/TriggerNationType/che_법가.php | 16 +++++++++++++- hwe/sammo/TriggerNationType/che_병가.php | 9 ++++++++ hwe/sammo/TriggerNationType/che_불가.php | 13 +++++++++++ hwe/sammo/TriggerNationType/che_오두미도.php | 4 ++++ hwe/sammo/TriggerNationType/che_유가.php | 4 ++++ hwe/sammo/TriggerNationType/che_음양가.php | 3 ++- hwe/sammo/TriggerNationType/che_종횡가.php | 7 +++++- hwe/sammo/TriggerNationType/che_중립.php | 6 ++--- hwe/sammo/TriggerNationType/che_태평도.php | 11 +++++++++- 14 files changed, 121 insertions(+), 17 deletions(-) diff --git a/hwe/sammo/TriggerNationType/che_덕가.php b/hwe/sammo/TriggerNationType/che_덕가.php index 966c54f1..2a579ab5 100644 --- a/hwe/sammo/TriggerNationType/che_덕가.php +++ b/hwe/sammo/TriggerNationType/che_덕가.php @@ -11,6 +11,24 @@ class che_덕가 implements iActionTrigger{ static $pros = '치안↑ 인구↑ 민심↑'; static $cons = '쌀수입↓ 수성↓'; + public function onCalcDomesticTurnScore(string $turnType, float $score, float $cost, float $successRate, float $failRate):array{ + if($turnType == 'secu'){ + $score *= 1.1; + $cost *= 0.8; + } + else if($turnType == 'trust' || $turnType == 'pop'){ + $score *= 1.1; + $cost *= 0.8; + } + + else if($turnType == 'def' || $turnType == 'wall'){ + $score *= 0.9; + $cost *= 1.2; + } + + return [$score, $cost, $successRate, $failRate]; + } + public function onCalcNationalIncome(string $type, int $amount):int{ if($type == 'rice'){ return $amount * 0.9; diff --git a/hwe/sammo/TriggerNationType/che_도가.php b/hwe/sammo/TriggerNationType/che_도가.php index 3865edde..08c57a6b 100644 --- a/hwe/sammo/TriggerNationType/che_도가.php +++ b/hwe/sammo/TriggerNationType/che_도가.php @@ -16,6 +16,10 @@ class che_도가 implements iActionTrigger{ $score *= 0.9; $cost *= 1.2; } + else if($turnType == 'secu'){ + $score *= 0.9; + $cost *= 1.2; + } return [$score, $cost, $successRate, $failRate]; } diff --git a/hwe/sammo/TriggerNationType/che_도적.php b/hwe/sammo/TriggerNationType/che_도적.php index 6ae7b6ed..b0853649 100644 --- a/hwe/sammo/TriggerNationType/che_도적.php +++ b/hwe/sammo/TriggerNationType/che_도적.php @@ -11,6 +11,19 @@ class che_도적 implements iActionTrigger{ static $pros = '계략↑'; static $cons = '금수입↓ 치안↓ 민심↓'; + public function onCalcDomesticTurnScore(string $turnType, float $score, float $cost, float $successRate, float $failRate):array{ + if($turnType == 'secu'){ + $score *= 0.9; + $cost *= 1.2; + } + else if($turnType == 'trust' || $turnType == 'pop'){ + $score *= 0.9; + $cost *= 1.2; + } + + return [$score, $cost, $successRate, $failRate]; + } + public function onCalcNationalIncome(string $type, int $amount):int{ if($type == 'gold'){ return $amount * 0.9; diff --git a/hwe/sammo/TriggerNationType/che_명가.php b/hwe/sammo/TriggerNationType/che_명가.php index f4444eab..ef988447 100644 --- a/hwe/sammo/TriggerNationType/che_명가.php +++ b/hwe/sammo/TriggerNationType/che_명가.php @@ -11,6 +11,20 @@ class che_명가 implements iActionTrigger{ static $pros = '기술↑ 인구↑'; static $cons = '쌀수입↓ 수성↓'; + public function onCalcDomesticTurnScore(string $turnType, float $score, float $cost, float $successRate, float $failRate):array{ + if($turnType == 'tech'){ + $score *= 1.1; + $cost *= 0.8; + } + + else if($turnType == 'def' || $turnType == 'wall'){ + $score *= 0.9; + $cost *= 1.2; + } + + return [$score, $cost, $successRate, $failRate]; + } + public function onCalcNationalIncome(string $type, int $amount):int{ if($type == 'rice'){ return $amount * 0.9; @@ -18,13 +32,4 @@ class che_명가 implements iActionTrigger{ return $amount; } - - public function onCalcDomesticTurnScore(string $turnType, float $score, float $cost, float $successRate, float $failRate):array{ - if($turnType == 'tech'){ - $score *= 1.1; - $cost *= 0.8; - } - - return [$score, $cost, $successRate, $failRate]; - } } \ No newline at end of file diff --git a/hwe/sammo/TriggerNationType/che_묵가.php b/hwe/sammo/TriggerNationType/che_묵가.php index 10a716ed..0364a30e 100644 --- a/hwe/sammo/TriggerNationType/che_묵가.php +++ b/hwe/sammo/TriggerNationType/che_묵가.php @@ -12,7 +12,12 @@ class che_묵가 implements iActionTrigger{ static $cons = '기술↓'; public function onCalcDomesticTurnScore(string $turnType, float $score, float $cost, float $successRate, float $failRate):array{ - if($turnType == 'tech'){ + if($turnType == 'def' || $turnType == 'wall'){ + $score *= 1.1; + $cost *= 0.8; + } + + else if($turnType == 'tech'){ $score *= 0.9; $cost *= 1.2; } diff --git a/hwe/sammo/TriggerNationType/che_법가.php b/hwe/sammo/TriggerNationType/che_법가.php index 0aacc0a5..b7bcf243 100644 --- a/hwe/sammo/TriggerNationType/che_법가.php +++ b/hwe/sammo/TriggerNationType/che_법가.php @@ -11,11 +11,25 @@ class che_법가 implements iActionTrigger{ static $pros = '금수입↑ 치안↑'; static $cons = '인구↓ 민심↓'; + public function onCalcDomesticTurnScore(string $turnType, float $score, float $cost, float $successRate, float $failRate):array{ + if($turnType == 'secu'){ + $score *= 1.1; + $cost *= 0.8; + } + + else if($turnType == 'trust' || $turnType == 'pop'){ + $score *= 0.9; + $cost *= 1.2; + } + + return [$score, $cost, $successRate, $failRate]; + } + public function onCalcNationalIncome(string $type, int $amount):int{ if($type == 'gold'){ return $amount * 1.1; } - + return $amount; } } \ No newline at end of file diff --git a/hwe/sammo/TriggerNationType/che_병가.php b/hwe/sammo/TriggerNationType/che_병가.php index 54f30875..25b8f988 100644 --- a/hwe/sammo/TriggerNationType/che_병가.php +++ b/hwe/sammo/TriggerNationType/che_병가.php @@ -16,6 +16,15 @@ class che_병가 implements iActionTrigger{ $score *= 1.1; $cost *= 0.8; } + else if($turnType == 'def' || $turnType == 'wall'){ + $score *= 1.1; + $cost *= 0.8; + } + + else if($turnType == 'trust' || $turnType == 'pop'){ + $score *= 0.9; + $cost *= 1.2; + } return [$score, $cost, $successRate, $failRate]; } diff --git a/hwe/sammo/TriggerNationType/che_불가.php b/hwe/sammo/TriggerNationType/che_불가.php index 73f8eaf1..bce1d232 100644 --- a/hwe/sammo/TriggerNationType/che_불가.php +++ b/hwe/sammo/TriggerNationType/che_불가.php @@ -11,6 +11,19 @@ class che_불가 implements iActionTrigger{ static $pros = '민심↑ 수성↑'; static $cons = '금수입↓'; + public function onCalcDomesticTurnScore(string $turnType, float $score, float $cost, float $successRate, float $failRate):array{ + if($turnType == 'trust' || $turnType == 'pop'){ + $score *= 1.1; + $cost *= 0.8; + } + else if($turnType == 'def' || $turnType == 'wall'){ + $score *= 1.1; + $cost *= 0.8; + } + + return [$score, $cost, $successRate, $failRate]; + } + public function onCalcNationalIncome(string $type, int $amount):int{ if($type == 'gold'){ return $amount * 0.9; diff --git a/hwe/sammo/TriggerNationType/che_오두미도.php b/hwe/sammo/TriggerNationType/che_오두미도.php index 5bedc444..380e5597 100644 --- a/hwe/sammo/TriggerNationType/che_오두미도.php +++ b/hwe/sammo/TriggerNationType/che_오두미도.php @@ -21,6 +21,10 @@ class che_오두미도 implements iActionTrigger{ $score *= 0.9; $cost *= 1.2; } + else if($turnType == 'def' || $turnType == 'wall'){ + $score *= 0.9; + $cost *= 1.2; + } return [$score, $cost, $successRate, $failRate]; } diff --git a/hwe/sammo/TriggerNationType/che_유가.php b/hwe/sammo/TriggerNationType/che_유가.php index 60020591..622f9e53 100644 --- a/hwe/sammo/TriggerNationType/che_유가.php +++ b/hwe/sammo/TriggerNationType/che_유가.php @@ -16,6 +16,10 @@ class che_유가 implements iActionTrigger{ $score *= 1.1; $cost *= 0.8; } + else if($turnType == 'trust' || $turnType == 'pop'){ + $score *= 1.1; + $cost *= 0.8; + } return [$score, $cost, $successRate, $failRate]; } diff --git a/hwe/sammo/TriggerNationType/che_음양가.php b/hwe/sammo/TriggerNationType/che_음양가.php index 0e82ad7e..62a8c81f 100644 --- a/hwe/sammo/TriggerNationType/che_음양가.php +++ b/hwe/sammo/TriggerNationType/che_음양가.php @@ -16,11 +16,12 @@ class che_음양가 implements iActionTrigger{ $score *= 1.1; $cost *= 0.8; } + else if($turnType == 'tech'){ $score *= 0.9; $cost *= 1.2; } - + return [$score, $cost, $successRate, $failRate]; } diff --git a/hwe/sammo/TriggerNationType/che_종횡가.php b/hwe/sammo/TriggerNationType/che_종횡가.php index fb75b445..57bc953c 100644 --- a/hwe/sammo/TriggerNationType/che_종횡가.php +++ b/hwe/sammo/TriggerNationType/che_종횡가.php @@ -12,7 +12,12 @@ class che_종횡가 implements iActionTrigger{ static $cons = '금수입↓ 내정↓'; public function onCalcDomesticTurnScore(string $turnType, float $score, float $cost, float $successRate, float $failRate):array{ - if($turnType == 'agri' || $turnType == 'comm'){ + if($turnType == 'def' || $turnType == 'wall'){ + $score *= 1.1; + $cost *= 0.8; + } + + else if($turnType == 'agri' || $turnType == 'comm'){ $score *= 0.9; $cost *= 1.2; } diff --git a/hwe/sammo/TriggerNationType/che_중립.php b/hwe/sammo/TriggerNationType/che_중립.php index 8a953b45..f83bf748 100644 --- a/hwe/sammo/TriggerNationType/che_중립.php +++ b/hwe/sammo/TriggerNationType/che_중립.php @@ -6,10 +6,10 @@ use \sammo\General; class che_중립 implements iActionTrigger{ use \sammo\DefaultActionTrigger; - static $name = '중립'; + static $name = '-'; static $info = ''; - static $pros = '-'; - static $cons = '-'; + static $pros = ''; + static $cons = ''; } \ No newline at end of file diff --git a/hwe/sammo/TriggerNationType/che_태평도.php b/hwe/sammo/TriggerNationType/che_태평도.php index 3ff38421..cea7b023 100644 --- a/hwe/sammo/TriggerNationType/che_태평도.php +++ b/hwe/sammo/TriggerNationType/che_태평도.php @@ -12,7 +12,16 @@ class che_태평도 implements iActionTrigger{ static $cons = '기술↓ 수성↓'; public function onCalcDomesticTurnScore(string $turnType, float $score, float $cost, float $successRate, float $failRate):array{ - if($turnType == 'tech'){ + if($turnType == 'trust' || $turnType == 'pop'){ + $score *= 1.1; + $cost *= 0.8; + } + + else if($turnType == 'tech'){ + $score *= 0.9; + $cost *= 1.2; + } + else if($turnType == 'def' || $turnType == 'wall'){ $score *= 0.9; $cost *= 1.2; }