diff --git a/hwe/sammo/GeneralTrigger/che_아이템치료.php b/hwe/sammo/GeneralTrigger/che_아이템치료.php index 9970a133..b0eee62f 100644 --- a/hwe/sammo/GeneralTrigger/che_아이템치료.php +++ b/hwe/sammo/GeneralTrigger/che_아이템치료.php @@ -16,6 +16,10 @@ class che_아이템치료 extends BaseGeneralTrigger{ $general = $this->object; if($general->getVar('injury') >= 10){ + if($general->getReservedTurn(0, $env) instanceof \sammo\Command\General\che_요양){ + return $env; + } + $general->updateVar('injury', 0); $general->activateSkill('pre.부상경감', 'pre.치료'); $itemObj = $general->getItem(); diff --git a/hwe/sammo/TriggerCaller.php b/hwe/sammo/TriggerCaller.php index 7207eab5..08137577 100644 --- a/hwe/sammo/TriggerCaller.php +++ b/hwe/sammo/TriggerCaller.php @@ -118,7 +118,7 @@ abstract class TriggerCaller{ return $this; } - function fire(?array $env = null, $arg = null):?array{ + function fire(array $env, $arg = null):?array{ foreach($this->triggerListByPriority as $priority=>$subTriggerList){ /** @var ObjectTrigger[] $subTriggerList */ foreach($subTriggerList as $trigger){ diff --git a/hwe/sammo/TurnExecutionHelper.php b/hwe/sammo/TurnExecutionHelper.php index 36ebc928..327d3e49 100644 --- a/hwe/sammo/TurnExecutionHelper.php +++ b/hwe/sammo/TurnExecutionHelper.php @@ -26,7 +26,7 @@ class TurnExecutionHelper return $this->generalObj; } - public function preprocessCommand(){ + public function preprocessCommand(array $env){ $general = $this->getGeneral(); $caller = $general->getPreTurnExecuteTriggerList($general); $caller->merge(new GeneralTriggerCaller( @@ -34,7 +34,7 @@ class TurnExecutionHelper new GeneralTrigger\che_병력군량소모($general) )); - $caller->fire(); + $caller->fire($env); } public function processBlocked():bool{ @@ -256,7 +256,7 @@ class TurnExecutionHelper $autorunMode = false; $ai = null; - $turnObj->preprocessCommand(); + $turnObj->preprocessCommand($env); if($general->getNPCType() >= 2 || ($autorun_user['limit_minutes']??false)){ $ai = new GeneralAI($turnObj->getGeneral());