diff --git a/hwe/sammo/ActionSpecialWar/che_의술.php b/hwe/sammo/ActionSpecialWar/che_의술.php index 688c08bf..ca601c3c 100644 --- a/hwe/sammo/ActionSpecialWar/che_의술.php +++ b/hwe/sammo/ActionSpecialWar/che_의술.php @@ -1,8 +1,6 @@ \ No newline at end of file diff --git a/hwe/sammo/GeneralTriggerCaller.php b/hwe/sammo/GeneralTriggerCaller.php index 63f8a1b2..6dbd958c 100644 --- a/hwe/sammo/GeneralTriggerCaller.php +++ b/hwe/sammo/GeneralTriggerCaller.php @@ -1,8 +1,8 @@ object); + $fqn = static::class; + return "{$priority}_{$fqn}_{$hash}"; + } +} +?> \ No newline at end of file diff --git a/hwe/sammo/TriggerCaller.php b/hwe/sammo/TriggerCaller.php index cfa54a24..873edbb6 100644 --- a/hwe/sammo/TriggerCaller.php +++ b/hwe/sammo/TriggerCaller.php @@ -5,7 +5,7 @@ abstract class TriggerCaller{ protected $triggerListByPriority = []; protected $sorted = false; - abstract function checkValidTrigger(iObjectTrigger $trigger):bool; + abstract function checkValidTrigger(ObjectTrigger $trigger):bool; function isEmpty():bool{ return !$this->triggerListByPriority; @@ -18,13 +18,13 @@ abstract class TriggerCaller{ } $sorted = true; - $minPriority = iObjectTrigger::PRIORITY_MAX; + $minPriority = ObjectTrigger::PRIORITY_MAX; foreach($triggerList as $trigger){ if(!checkValidTrigger($trigger)){ throw new \InvalidArgumentException('Invalid Trigger Type'); } - /** @var iObjectTrigger $trigger */ + /** @var ObjectTrigger $trigger */ $priority = $trigger->getPriority(); $uniqueID = $trigger->getUniqueID(); @@ -51,7 +51,7 @@ abstract class TriggerCaller{ } - function append(iObjectTrigger $trigger){ + function append(ObjectTrigger $trigger){ if(!checkValidTrigger($trigger)){ throw new \InvalidArgumentException('Invalid Trigger Type'); } @@ -122,7 +122,7 @@ abstract class TriggerCaller{ } foreach($this->triggerListByPriority as $subTriggerList){ - /** @var iObjectTrigger[] $subTriggerList */ + /** @var ObjectTrigger[] $subTriggerList */ foreach($subTriggerList as $trigger){ $env = $trigger->action($env, $arg); } diff --git a/hwe/sammo/WarUnitTrigger.php b/hwe/sammo/WarUnitTrigger.php new file mode 100644 index 00000000..56bab23d --- /dev/null +++ b/hwe/sammo/WarUnitTrigger.php @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/hwe/sammo/WarUnitTriggerCaller.php b/hwe/sammo/WarUnitTriggerCaller.php index 198405c2..84f51318 100644 --- a/hwe/sammo/WarUnitTriggerCaller.php +++ b/hwe/sammo/WarUnitTriggerCaller.php @@ -1,8 +1,8 @@ \ No newline at end of file diff --git a/hwe/sammo/iObjectTrigger.php b/hwe/sammo/iObjectTrigger.php deleted file mode 100644 index 3f9eaf0f..00000000 --- a/hwe/sammo/iObjectTrigger.php +++ /dev/null @@ -1,16 +0,0 @@ - \ No newline at end of file diff --git a/hwe/sammo/iWarUnitTrigger.php b/hwe/sammo/iWarUnitTrigger.php deleted file mode 100644 index c7d071a3..00000000 --- a/hwe/sammo/iWarUnitTrigger.php +++ /dev/null @@ -1,7 +0,0 @@ - \ No newline at end of file