From 574ca07afe96839c0c4805e57d32b766794cf460 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 20 Feb 2022 04:01:03 +0900
Subject: [PATCH] =?UTF-8?q?game,feat:=20=EC=A1=B0=EB=8B=AC=20=ED=9A=A8?=
 =?UTF-8?q?=EC=9C=A8=20=EB=B3=80=EA=B2=BD=20trigger=20=EC=B6=94=EA=B0=80,?=
 =?UTF-8?q?=20=EC=A1=B0=EB=8B=AC=20=EC=9C=A0=EB=8B=88=ED=81=AC=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/ActionItem/che_조달_주판.php     | 22 ++++++++++++++++++++++
 hwe/sammo/Command/General/che_물자조달.php | 15 +++++++++++----
 2 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 hwe/sammo/ActionItem/che_조달_주판.php

diff --git a/hwe/sammo/ActionItem/che_조달_주판.php b/hwe/sammo/ActionItem/che_조달_주판.php
new file mode 100644
index 00000000..a7517b86
--- /dev/null
+++ b/hwe/sammo/ActionItem/che_조달_주판.php
@@ -0,0 +1,22 @@
+<?php
+namespace sammo\ActionItem;
+use \sammo\iAction;
+use \sammo\General;
+use sammo\Util;
+
+class che_조달_주판 extends \sammo\BaseItem{
+
+    protected $rawName = '주판';
+    protected $name = '주판(조달)';
+    protected $info = '[내정] 물자조달 성공 확률 +20%p, 물자조달 획득량 +100%p';
+    protected $cost = 200;
+    protected $consumable = false;
+
+    public function onCalcStrategic(string $turnType, string $varType, $value){
+        if($turnType === '조달'){
+            if($varType == 'success') return $value + 0.2;
+            if($varType == 'score') return $value * 2;
+        }
+        return $value;
+    }
+}
\ No newline at end of file
diff --git a/hwe/sammo/Command/General/che_물자조달.php b/hwe/sammo/Command/General/che_물자조달.php
index ed63bc7b..6ef41490 100644
--- a/hwe/sammo/Command/General/che_물자조달.php
+++ b/hwe/sammo/Command/General/che_물자조달.php
@@ -79,13 +79,20 @@ class che_물자조달 extends Command\GeneralCommand{
         $score *= getDomesticExpLevelBonus($general->getVar('explevel'));
         $score *= Util::randRange(0.8, 1.2);
 
+        $successRatio = 0.1;
+        $failRatio = 0.3;
+
+        $successRatio = $general->onCalcDomestic('조달', 'success', $successRatio);
+        $failRatio = $general->onCalcDomestic('조달', 'fail', $failRatio);
+        $normalRatio = 1 - $failRatio - $successRatio;
+
         $pick = Util::choiceRandomUsingWeight([
-            'fail'=>0.3,
-            'success'=>0.1,
-            'normal'=>0.6
+            'fail'=>$failRatio,
+            'success'=>$successRatio,
+            'normal'=>$normalRatio
         ]);
         $score *= CriticalScoreEx($pick);
-
+        $score = $general->onCalcDomestic('조달', 'score', $score);
 
         $score = Util::round($score);
         $scoreText = number_format($score, 0);