From 9ade8f69fd28e2699be577f208aad5687dbda51e Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 17 May 2020 18:15:02 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/ActionSpecialDomestic/che_축성.php |  2 +-
 hwe/sammo/TriggerOfficerLevel.php            | 33 +++++++++++---------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/hwe/sammo/ActionSpecialDomestic/che_축성.php b/hwe/sammo/ActionSpecialDomestic/che_축성.php
index d137f241..fc43ba31 100644
--- a/hwe/sammo/ActionSpecialDomestic/che_축성.php
+++ b/hwe/sammo/ActionSpecialDomestic/che_축성.php
@@ -8,7 +8,7 @@ class che_축성 extends \sammo\BaseSpecial{
 
     protected $id = 10;
     protected $name = '축성';
-    protected $info = '[내정] 기술 연구 : 기본 보정 +10%, 성공률 +10%p, 비용 -20%';
+    protected $info = '[내정] 성벽 보수 : 기본 보정 +10%, 성공률 +10%p, 비용 -20%';
 
     static $selectWeightType = SpecialityHelper::WEIGHT_NORM;
     static $selectWeight = 1;
diff --git a/hwe/sammo/TriggerOfficerLevel.php b/hwe/sammo/TriggerOfficerLevel.php
index 21a7f6d5..e8a0f2e8 100644
--- a/hwe/sammo/TriggerOfficerLevel.php
+++ b/hwe/sammo/TriggerOfficerLevel.php
@@ -25,27 +25,30 @@ class TriggerOfficerLevel implements iAction{
     }
 
     public function onCalcDomestic(string $turnType, string $varType, float $value, $aux=null):float{
-        if($turnType == '농업' || $turnType == '상업'){
-            if(in_array($this->officerLevel, [12, 11, 9, 7, 5, 3])){
-                return $value * 1.05;
+        if($varType == 'score'){
+            if($turnType == '농업' || $turnType == '상업'){
+                if(in_array($this->officerLevel, [12, 11, 9, 7, 5, 3])){
+                    return $value * 1.05;
+                }
             }
-        }
-        else if($turnType == '기술'){
-            if(in_array($this->officerLevel, [12, 11, 9, 7, 5])){
-                return $value * 1.05;
+            else if($turnType == '기술'){
+                if(in_array($this->officerLevel, [12, 11, 9, 7, 5])){
+                    return $value * 1.05;
+                }
             }
-        }
-        else if($turnType == '민심' || $turnType == '인구'){
-            if(in_array($this->officerLevel, [12, 11, 2])){
-                return $value * 1.05;
+            else if($turnType == '민심' || $turnType == '인구'){
+                if(in_array($this->officerLevel, [12, 11, 2])){
+                    return $value * 1.05;
+                }
             }
-        }
-        else if($turnType == '수비' || $turnType == '성벽' || $turnType == '치안'){
-            if(in_array($this->officerLevel, [12, 11, 10, 8, 6, 4])){
-                return $value * 1.05;
+            else if($turnType == '수비' || $turnType == '성벽' || $turnType == '치안'){
+                if(in_array($this->officerLevel, [12, 11, 10, 8, 6, 4])){
+                    return $value * 1.05;
+                }
             }
         }
         
+        
         return $value;
     }