From 0f8a8011bea163318a558cf4d5f950a77d89b346 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Mon, 25 Jul 2022 00:29:20 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EC=A4=91=EB=B3=B5=EB=90=98=EB=8A=94=20W?=
 =?UTF-8?q?arUnitTrigger=EC=9D=98=20priority=20=EC=A0=95=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/WarUnitTrigger/che_격노발동.php         | 2 +-
 hwe/sammo/WarUnitTrigger/che_격노시도.php         | 2 +-
 hwe/sammo/WarUnitTrigger/che_계략발동.php         | 2 +-
 hwe/sammo/WarUnitTrigger/che_계략실패.php         | 2 +-
 hwe/sammo/WarUnitTrigger/che_궁병선제사격.php     | 2 +-
 hwe/sammo/WarUnitTrigger/che_기병병종전투.php     | 2 +-
 hwe/sammo/WarUnitTrigger/che_반계발동.php         | 4 ++--
 hwe/sammo/WarUnitTrigger/che_방어력증가5p.php     | 2 +-
 hwe/sammo/WarUnitTrigger/che_성벽부상무효.php     | 2 +-
 hwe/sammo/WarUnitTrigger/che_약탈발동.php         | 2 +-
 hwe/sammo/WarUnitTrigger/che_전멸시페이즈증가.php | 2 +-
 hwe/sammo/WarUnitTrigger/che_전투치료발동.php     | 2 +-
 hwe/sammo/WarUnitTrigger/che_전투치료시도.php     | 2 +-
 hwe/sammo/WarUnitTrigger/che_필살시도.php         | 2 +-
 hwe/sammo/WarUnitTrigger/능력치변경.php           | 4 ++--
 hwe/sammo/WarUnitTrigger/전투력보정.php           | 2 +-
 16 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/hwe/sammo/WarUnitTrigger/che_격노발동.php b/hwe/sammo/WarUnitTrigger/che_격노발동.php
index 812a9a51..1b9f105e 100644
--- a/hwe/sammo/WarUnitTrigger/che_격노발동.php
+++ b/hwe/sammo/WarUnitTrigger/che_격노발동.php
@@ -25,7 +25,7 @@ class che_격노발동 extends BaseWarUnitTrigger{
 
         $self->getLogger()->pushGeneralBattleDetailLog("상대의 {$targetAct}에 <C>{$reaction}</>했다!</>", ActionLogger::PLAIN);
         $oppose->getLogger()->pushGeneralBattleDetailLog("{$targetAct}에 상대가 <R>{$reaction}</>했다!</>", ActionLogger::PLAIN);
-         
+
         if($is진노){
             $self->addBonusPhase(1);
         }
diff --git a/hwe/sammo/WarUnitTrigger/che_격노시도.php b/hwe/sammo/WarUnitTrigger/che_격노시도.php
index 6f48958f..a6587cda 100644
--- a/hwe/sammo/WarUnitTrigger/che_격노시도.php
+++ b/hwe/sammo/WarUnitTrigger/che_격노시도.php
@@ -9,7 +9,7 @@ use sammo\ObjectTrigger;
 use sammo\Util;
 
 class che_격노시도 extends BaseWarUnitTrigger{
-    protected $priority = ObjectTrigger::PRIORITY_POST + 300;
+    protected $priority = ObjectTrigger::PRIORITY_BODY + 400;
 
     protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv):bool{
         if(!$oppose->hasActivatedSkill('필살') && !$oppose->hasActivatedSkill('회피')){
diff --git a/hwe/sammo/WarUnitTrigger/che_계략발동.php b/hwe/sammo/WarUnitTrigger/che_계략발동.php
index ea961424..e519fbb7 100644
--- a/hwe/sammo/WarUnitTrigger/che_계략발동.php
+++ b/hwe/sammo/WarUnitTrigger/che_계략발동.php
@@ -10,7 +10,7 @@ use sammo\ObjectTrigger;
 use sammo\ActionLogger;
 
 class che_계략발동 extends BaseWarUnitTrigger{
-    protected $priority = ObjectTrigger::PRIORITY_POST + 100;
+    protected $priority = ObjectTrigger::PRIORITY_POST + 300;
 
     protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv):bool{
         if(!$self->hasActivatedSkill('계략')){
diff --git a/hwe/sammo/WarUnitTrigger/che_계략실패.php b/hwe/sammo/WarUnitTrigger/che_계략실패.php
index 5545c795..32e41923 100644
--- a/hwe/sammo/WarUnitTrigger/che_계략실패.php
+++ b/hwe/sammo/WarUnitTrigger/che_계략실패.php
@@ -10,7 +10,7 @@ use sammo\ObjectTrigger;
 use sammo\ActionLogger;
 
 class che_계략실패 extends BaseWarUnitTrigger{
-    protected $priority = ObjectTrigger::PRIORITY_POST + 200;
+    protected $priority = ObjectTrigger::PRIORITY_POST + 300;
 
     protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv):bool{
         if(!$self->hasActivatedSkill('계략실패')){
diff --git a/hwe/sammo/WarUnitTrigger/che_궁병선제사격.php b/hwe/sammo/WarUnitTrigger/che_궁병선제사격.php
index 3e41aeb4..f203b740 100644
--- a/hwe/sammo/WarUnitTrigger/che_궁병선제사격.php
+++ b/hwe/sammo/WarUnitTrigger/che_궁병선제사격.php
@@ -14,7 +14,7 @@ use sammo\ObjectTrigger;
 
 class che_궁병선제사격 extends BaseWarUnitTrigger
 {
-    protected $priority = ObjectTrigger::PRIORITY_BEGIN;
+    protected $priority = ObjectTrigger::PRIORITY_BEGIN + 50;
 
     protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv): bool
     {
diff --git a/hwe/sammo/WarUnitTrigger/che_기병병종전투.php b/hwe/sammo/WarUnitTrigger/che_기병병종전투.php
index 7fe85755..51ad08f0 100644
--- a/hwe/sammo/WarUnitTrigger/che_기병병종전투.php
+++ b/hwe/sammo/WarUnitTrigger/che_기병병종전투.php
@@ -9,7 +9,7 @@ use sammo\Util;
 use sammo\ObjectTrigger;
 
 class che_기병병종전투 extends BaseWarUnitTrigger{
-    protected $priority = ObjectTrigger::PRIORITY_FINAL; //최후미
+    protected $priority = ObjectTrigger::PRIORITY_FINAL + 100; //최후미
 
     protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv):bool{
         if(!$self->isAttacker()){
diff --git a/hwe/sammo/WarUnitTrigger/che_반계발동.php b/hwe/sammo/WarUnitTrigger/che_반계발동.php
index 5cee38a0..4f5e0805 100644
--- a/hwe/sammo/WarUnitTrigger/che_반계발동.php
+++ b/hwe/sammo/WarUnitTrigger/che_반계발동.php
@@ -10,7 +10,7 @@ use sammo\ObjectTrigger;
 use sammo\ActionLogger;
 
 class che_반계발동 extends BaseWarUnitTrigger{
-    protected $priority = ObjectTrigger::PRIORITY_POST + 150;
+    protected $priority = ObjectTrigger::PRIORITY_POST + 250;
 
     protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv):bool{
         if(!$self->hasActivatedSkill('반계')){
@@ -20,7 +20,7 @@ class che_반계발동 extends BaseWarUnitTrigger{
         $general = $self->getGeneral();
 
         [$opposeMagic, $damage] = $opposeEnv['magic'];
-        
+
 
         $josaUl = \sammo\JosaUtil::pick($opposeMagic, '을');
 
diff --git a/hwe/sammo/WarUnitTrigger/che_방어력증가5p.php b/hwe/sammo/WarUnitTrigger/che_방어력증가5p.php
index fce2a2a3..c89303dd 100644
--- a/hwe/sammo/WarUnitTrigger/che_방어력증가5p.php
+++ b/hwe/sammo/WarUnitTrigger/che_방어력증가5p.php
@@ -9,7 +9,7 @@ use sammo\Util;
 use sammo\ObjectTrigger;
 
 class che_방어력증가5p extends BaseWarUnitTrigger{
-    protected $priority = ObjectTrigger::PRIORITY_FINAL; //최후미
+    protected $priority = ObjectTrigger::PRIORITY_FINAL + 200; //최후미
 
     protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv):bool{
         if(!$self->isAttacker()){
diff --git a/hwe/sammo/WarUnitTrigger/che_성벽부상무효.php b/hwe/sammo/WarUnitTrigger/che_성벽부상무효.php
index 27f0ebb7..ec54f925 100644
--- a/hwe/sammo/WarUnitTrigger/che_성벽부상무효.php
+++ b/hwe/sammo/WarUnitTrigger/che_성벽부상무효.php
@@ -8,7 +8,7 @@ use sammo\GameUnitDetail;
 use sammo\ObjectTrigger;
 
 class che_성벽부상무효 extends BaseWarUnitTrigger{
-    protected $priority = ObjectTrigger::PRIORITY_BEGIN + 100;
+    protected $priority = ObjectTrigger::PRIORITY_BEGIN + 150;
 
     protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv):bool{
         assert($self instanceof WarUnitGeneral, 'General만 발동 가능');
diff --git a/hwe/sammo/WarUnitTrigger/che_약탈발동.php b/hwe/sammo/WarUnitTrigger/che_약탈발동.php
index f580a969..a2c148c2 100644
--- a/hwe/sammo/WarUnitTrigger/che_약탈발동.php
+++ b/hwe/sammo/WarUnitTrigger/che_약탈발동.php
@@ -14,7 +14,7 @@ use sammo\GameConst;
 
 class che_약탈발동 extends BaseWarUnitTrigger
 {
-    protected $priority = ObjectTrigger::PRIORITY_POST + 400;
+    protected $priority = ObjectTrigger::PRIORITY_POST + 350;
 
     protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv): bool
     {
diff --git a/hwe/sammo/WarUnitTrigger/che_전멸시페이즈증가.php b/hwe/sammo/WarUnitTrigger/che_전멸시페이즈증가.php
index 235b596e..f729fc89 100644
--- a/hwe/sammo/WarUnitTrigger/che_전멸시페이즈증가.php
+++ b/hwe/sammo/WarUnitTrigger/che_전멸시페이즈증가.php
@@ -10,7 +10,7 @@ use sammo\ObjectTrigger;
 use sammo\ActionLogger;
 
 class che_전멸시페이즈증가 extends BaseWarUnitTrigger{
-    protected $priority = ObjectTrigger::PRIORITY_POST + 700;
+    protected $priority = ObjectTrigger::PRIORITY_POST + 800;
 
     protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv):bool{
         /** @var WarUnitGeneral $self */
diff --git a/hwe/sammo/WarUnitTrigger/che_전투치료발동.php b/hwe/sammo/WarUnitTrigger/che_전투치료발동.php
index 6778b56c..ca68c891 100644
--- a/hwe/sammo/WarUnitTrigger/che_전투치료발동.php
+++ b/hwe/sammo/WarUnitTrigger/che_전투치료발동.php
@@ -10,7 +10,7 @@ use sammo\ObjectTrigger;
 use sammo\ActionLogger;
 
 class che_전투치료발동 extends BaseWarUnitTrigger{
-    protected $priority = ObjectTrigger::PRIORITY_POST + 300;
+    protected $priority = ObjectTrigger::PRIORITY_POST + 550;
 
     protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv):bool{
         if(!$self->hasActivatedSkill('치료')){
diff --git a/hwe/sammo/WarUnitTrigger/che_전투치료시도.php b/hwe/sammo/WarUnitTrigger/che_전투치료시도.php
index fb255b0a..4ab651e2 100644
--- a/hwe/sammo/WarUnitTrigger/che_전투치료시도.php
+++ b/hwe/sammo/WarUnitTrigger/che_전투치료시도.php
@@ -9,7 +9,7 @@ use sammo\Util;
 use sammo\ObjectTrigger;
 
 class che_전투치료시도 extends BaseWarUnitTrigger{
-    protected $priority = ObjectTrigger::PRIORITY_PRE + 300;
+    protected $priority = ObjectTrigger::PRIORITY_PRE + 350;
 
     protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv):bool{
         assert($self instanceof WarUnitGeneral, 'General만 발동 가능');
diff --git a/hwe/sammo/WarUnitTrigger/che_필살시도.php b/hwe/sammo/WarUnitTrigger/che_필살시도.php
index ab84a410..f220467b 100644
--- a/hwe/sammo/WarUnitTrigger/che_필살시도.php
+++ b/hwe/sammo/WarUnitTrigger/che_필살시도.php
@@ -9,7 +9,7 @@ use sammo\ObjectTrigger;
 use sammo\Util;
 
 class che_필살시도 extends BaseWarUnitTrigger{
-    protected $priority = ObjectTrigger::PRIORITY_PRE + 100;
+    protected $priority = ObjectTrigger::PRIORITY_PRE + 120;
 
     protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv):bool{
         if(!($self instanceof WarUnitGeneral)){
diff --git a/hwe/sammo/WarUnitTrigger/능력치변경.php b/hwe/sammo/WarUnitTrigger/능력치변경.php
index 0fc7f9de..00d46c37 100644
--- a/hwe/sammo/WarUnitTrigger/능력치변경.php
+++ b/hwe/sammo/WarUnitTrigger/능력치변경.php
@@ -8,7 +8,7 @@ use sammo\GameUnitDetail;
 use sammo\ObjectTrigger;
 
 class 능력치변경 extends BaseWarUnitTrigger{
-    protected $priority = ObjectTrigger::PRIORITY_BEGIN;
+    protected $priority = ObjectTrigger::PRIORITY_BEGIN + 10;
 
     protected $variable;
     protected $operator;
@@ -54,7 +54,7 @@ class 능력치변경 extends BaseWarUnitTrigger{
         }
 
         $this->processConsumableItem();
-        
+
         return true;
     }
 }
\ No newline at end of file
diff --git a/hwe/sammo/WarUnitTrigger/전투력보정.php b/hwe/sammo/WarUnitTrigger/전투력보정.php
index a06931de..a9992edd 100644
--- a/hwe/sammo/WarUnitTrigger/전투력보정.php
+++ b/hwe/sammo/WarUnitTrigger/전투력보정.php
@@ -8,7 +8,7 @@ use sammo\GameUnitDetail;
 use sammo\ObjectTrigger;
 
 class 전투력보정 extends BaseWarUnitTrigger{
-    protected $priority = ObjectTrigger::PRIORITY_BEGIN;
+    protected $priority = ObjectTrigger::PRIORITY_BEGIN + 20;
 
     public function __construct(WarUnit $unit, protected int|float $attackerWarPowerMultiplier, protected int|float $defenderWarPowerMultiplier = 1){
         $this->object = $unit;