devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

isConsumableNow 버그 수정

Browse Source
This commit is contained in:
Hide_D
2019-10-09 11:38:28 +09:00
parent 68aeafaa0b
commit 09ae205e37
8 changed files with 4 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/ActionItem/che_계략_삼략.php
-7
View File
@@ -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;
}
}
hwe/sammo/ActionItem/che_계략_육도.php
-7
View File
@@ -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;
}
}
hwe/sammo/ActionItem/che_치료_도소연명.php
-7
View File
@@ -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;
}
}
hwe/sammo/ActionItem/che_치료_무후행군.php
-7
View File
@@ -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;
}
}
hwe/sammo/ActionItem/che_치료_오석산.php
+1 -1
View File
@@ -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;
}
hwe/sammo/ActionItem/che_치료_정력견혈.php
-7
View File
@@ -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;
}
}
hwe/sammo/ActionItem/che_치료_칠엽청점.php
-7
View File
@@ -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;
}
}
hwe/sammo/GeneralTrigger/che_아이템치료.php
+3 -3
View File
@@ -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();
}
}