From 09ae205e3754318aafe19cd70f48e1988ffbe4d4 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 9 Oct 2019 11:38:28 +0900
Subject: [PATCH] =?UTF-8?q?isConsumableNow=20=EB=B2=84=EA=B7=B8=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/ActionItem/che_계략_삼략.php      | 7 -------
 hwe/sammo/ActionItem/che_계략_육도.php      | 7 -------
 hwe/sammo/ActionItem/che_치료_도소연명.php  | 7 -------
 hwe/sammo/ActionItem/che_치료_무후행군.php  | 7 -------
 hwe/sammo/ActionItem/che_치료_오석산.php    | 2 +-
 hwe/sammo/ActionItem/che_치료_정력견혈.php  | 7 -------
 hwe/sammo/ActionItem/che_치료_칠엽청점.php  | 7 -------
 hwe/sammo/GeneralTrigger/che_아이템치료.php | 6 +++---
 8 files changed, 4 insertions(+), 46 deletions(-)

diff --git a/hwe/sammo/ActionItem/che_계략_삼략.php b/hwe/sammo/ActionItem/che_계략_삼략.php
index d940f696..ec6eb25e 100644
--- a/hwe/sammo/ActionItem/che_계략_삼략.php
+++ b/hwe/sammo/ActionItem/che_계략_삼략.php
@@ -18,11 +18,4 @@ class che_계략_삼략 extends \sammo\BaseItem{
         
         return $value;
     }
-
-    function isConsumableNow(string $actionType, string $command):bool{
-        if($actionType == 'GeneralCommand' && $command == '계략'){
-            return true;
-        }
-        return false;
-    }
 }
\ No newline at end of file
diff --git a/hwe/sammo/ActionItem/che_계략_육도.php b/hwe/sammo/ActionItem/che_계략_육도.php
index a4cc6c60..a136d50d 100644
--- a/hwe/sammo/ActionItem/che_계략_육도.php
+++ b/hwe/sammo/ActionItem/che_계략_육도.php
@@ -18,11 +18,4 @@ class che_계략_육도 extends \sammo\BaseItem{
         
         return $value;
     }
-
-    function isConsumableNow(string $actionType, string $command):bool{
-        if($actionType == 'GeneralCommand' && $command == '계략'){
-            return true;
-        }
-        return false;
-    }
 }
\ No newline at end of file
diff --git a/hwe/sammo/ActionItem/che_치료_도소연명.php b/hwe/sammo/ActionItem/che_치료_도소연명.php
index 8f3fd1e2..3119c041 100644
--- a/hwe/sammo/ActionItem/che_치료_도소연명.php
+++ b/hwe/sammo/ActionItem/che_치료_도소연명.php
@@ -18,11 +18,4 @@ class che_치료_도소연명 extends \sammo\BaseItem{
             new GeneralTrigger\che_아이템치료($general)
         );
     }
-
-    function isConsumableNow(string $actionType, string $command):bool{
-        if($actionType == 'GeneralTrigger' && $command == 'che_아이템치료'){
-            return true;
-        }
-        return false;
-    }
 }
\ No newline at end of file
diff --git a/hwe/sammo/ActionItem/che_치료_무후행군.php b/hwe/sammo/ActionItem/che_치료_무후행군.php
index 3b2fa3ed..968a69b1 100644
--- a/hwe/sammo/ActionItem/che_치료_무후행군.php
+++ b/hwe/sammo/ActionItem/che_치료_무후행군.php
@@ -18,11 +18,4 @@ class che_치료_무후행군 extends \sammo\BaseItem{
             new GeneralTrigger\che_아이템치료($general)
         );
     }
-
-    function isConsumableNow(string $actionType, string $command):bool{
-        if($actionType == 'GeneralTrigger' && $command == 'che_아이템치료'){
-            return true;
-        }
-        return false;
-    }
 }
\ No newline at end of file
diff --git a/hwe/sammo/ActionItem/che_치료_오석산.php b/hwe/sammo/ActionItem/che_치료_오석산.php
index 5a704316..e02e8b4a 100644
--- a/hwe/sammo/ActionItem/che_치료_오석산.php
+++ b/hwe/sammo/ActionItem/che_치료_오석산.php
@@ -19,7 +19,7 @@ class che_치료_오석산 extends \sammo\BaseItem{
         );
     }
 
-    function isConsumableNow(string $actionType, string $command):bool{
+    function isValidTurnItem(string $actionType, string $command):bool{
         if($actionType == 'GeneralTrigger' && $command == 'che_아이템치료'){
             return true;
         }
diff --git a/hwe/sammo/ActionItem/che_치료_정력견혈.php b/hwe/sammo/ActionItem/che_치료_정력견혈.php
index a6532840..f8fa9dc1 100644
--- a/hwe/sammo/ActionItem/che_치료_정력견혈.php
+++ b/hwe/sammo/ActionItem/che_치료_정력견혈.php
@@ -18,11 +18,4 @@ class che_치료_정력견혈 extends \sammo\BaseItem{
             new GeneralTrigger\che_아이템치료($general)
         );
     }
-
-    function isConsumableNow(string $actionType, string $command):bool{
-        if($actionType == 'GeneralTrigger' && $command == 'che_아이템치료'){
-            return true;
-        }
-        return false;
-    }
 }
\ No newline at end of file
diff --git a/hwe/sammo/ActionItem/che_치료_칠엽청점.php b/hwe/sammo/ActionItem/che_치료_칠엽청점.php
index df5f9e9a..215212aa 100644
--- a/hwe/sammo/ActionItem/che_치료_칠엽청점.php
+++ b/hwe/sammo/ActionItem/che_치료_칠엽청점.php
@@ -18,11 +18,4 @@ class che_치료_칠엽청점 extends \sammo\BaseItem{
             new GeneralTrigger\che_아이템치료($general)
         );
     }
-
-    function isConsumableNow(string $actionType, string $command):bool{
-        if($actionType == 'GeneralTrigger' && $command == 'che_아이템치료'){
-            return true;
-        }
-        return false;
-    }
 }
\ No newline at end of file
diff --git a/hwe/sammo/GeneralTrigger/che_아이템치료.php b/hwe/sammo/GeneralTrigger/che_아이템치료.php
index 0c9e3c62..14107f9a 100644
--- a/hwe/sammo/GeneralTrigger/che_아이템치료.php
+++ b/hwe/sammo/GeneralTrigger/che_아이템치료.php
@@ -19,11 +19,11 @@ class che_아이템치료 extends BaseGeneralTrigger{
             $general->updateVar('injury', 0);
             $general->activateSkill('pre.부상경감', 'pre.치료');
             $itemObj = $general->getItem();
-            $itemName = $itemObj->$name;
+            $itemName = $itemObj->getName();
             $josaUl = JosaUtil::pick($itemName, '을');
-            $logger->pushGeneralActionLog("<C>{$itemName}</>{$josaUl} 사용하여 치료합니다!", ActionLogger::PLAIN);
+            $general->getLogger()->pushGeneralActionLog("<C>{$itemName}</>{$josaUl} 사용하여 치료합니다!", ActionLogger::PLAIN);
 
-            if($itemObj::$consumable && $itemObj->isConsumableNow('GeneralTrigger', 'che_아이템치료')){
+            if($itemObj->isConsumableNow('GeneralTrigger', 'che_아이템치료')){
                 $general->deleteItem();
             }
         }