TriggerCaller버그 수정

hwe/sammo/ActionItem/che_의술_청낭서.php

@@ -20,7 +20,6 @@ class che_의술_청낭서 extends \sammo\BaseItem{
 
     public function getPreTurnExecuteTriggerList(General $general):?GeneralTriggerCaller{
         return new GeneralTriggerCaller(
-            new GeneralTrigger\che_아이템치료($general),
             new GeneralTrigger\che_도시치료($general)
         );
     }

hwe/sammo/ActionItem/che_의술_태평청령.php

@@ -20,7 +20,6 @@ class che_의술_태평청령 extends \sammo\BaseItem{
 
     public function getPreTurnExecuteTriggerList(General $general):?GeneralTriggerCaller{
         return new GeneralTriggerCaller(
-            new GeneralTrigger\che_아이템치료($general),
             new GeneralTrigger\che_도시치료($general)
         );
     }

hwe/sammo/Command/General/che_하야.php

@@ -83,6 +83,7 @@ class che_하야 extends Command\GeneralCommand{
         $general->setVar('dedication', $general->getVar('dedication') * (1 - 0.1 * $general->getVar('betray')));
         $general->addDedication(0, false);
         $general->increaseVarWithLimit('betray', 1, null, GameConst::$maxBetrayCnt);
+        $general->setVar('permission', 'normal');
 
         $newGold = Util::valueFit($general->getVar('gold'), null, GameConst::$defaultGold);
         $newRice = Util::valueFit($general->getVar('rice'), null, GameConst::$defaultRice);

hwe/sammo/Event/Action/CreateManyNPC.php

@@ -7,7 +7,6 @@ class CreateManyNPC extends \sammo\Event\Action{
     protected $npcCount;
     protected $avgGen;
     public function __construct($npcCount = 200){
-        \sammo\LogText('ctc',$npcCount);
         $this->npcCount = $npcCount;
     }
 

hwe/sammo/General.php

@@ -756,9 +756,6 @@ class General implements iAction{
             if(!$iObj){
                 continue;
             }
-            if($caller->isEmpty()){
-                continue;
-            }
             /** @var iAction $iObj */
             $caller->merge($iObj->getPreTurnExecuteTriggerList($general));
         }

hwe/sammo/GeneralTrigger/che_도시치료.php

@@ -8,7 +8,7 @@ use sammo\Util;
 use sammo\JosaUtil;
 
 class che_도시치료 extends BaseGeneralTrigger{
-    protected $priority = 10000;
+    protected $priority = 10010;
 
     public function action(?array $env=null, $arg=null):?array{
 

hwe/sammo/GeneralTrigger/che_부상경감.php

@@ -8,7 +8,7 @@ use sammo\Util;
 use sammo\JosaUtil;
 
 class che_부상경감 extends BaseGeneralTrigger{
-    protected $priority = 30010;
+    protected $priority = 10000;
 
     public function action(?array $env=null, $arg=null):?array{
 

hwe/sammo/GeneralTrigger/che_아이템치료.php

@@ -15,7 +15,7 @@ class che_아이템치료 extends BaseGeneralTrigger{
         /** @var \sammo\General $general */
         $general = $this->object;
 
-        if($general->getVar('injury') > 0){
+        if($general->getVar('injury') >= 10){
             $general->updateVar('injury', 0);
             $general->activateSkill('pre.부상경감', 'pre.치료');
             $itemObj = $general->getItem();

hwe/sammo/ObjectTrigger.php

@@ -9,6 +9,7 @@ abstract class ObjectTrigger{
     const PRIORITY_POST  = 40000;
     const PRIORITY_FINAL = 50000;
 
+    /** @var int 낮을 수록 우선순위가 높다. */
     protected $priority;
     protected $object = null;
 

hwe/sammo/TriggerCaller.php

@@ -94,7 +94,7 @@ abstract class TriggerCaller{
                 $iterLhs->next();
                 continue;
             }
-            if($iterRhs->key() > $iterLhs->key()){
+            if($iterRhs->key() < $iterLhs->key()){
                 $newTriggerList[$iterRhs->key()] = $iterRhs->current();
                 $iterRhs->next();
                 continue;