From 4bf77a5c5579a41e3d222b6ebab5c4223f2a69e0 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Sun, 28 Aug 2022 14:35:14 +0900
Subject: [PATCH] =?UTF-8?q?game:=20=EA=B6=81=EB=B3=91=20=EA=B3=B5=EA=B2=A9?=
 =?UTF-8?q?=20=EC=8B=9C=EB=8F=84,=20=EC=B6=94=EA=B0=80=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A6=88=20=EC=84=A0=EC=A0=9C=20=EA=B3=B5=EA=B2=A9=20-=20?=
 =?UTF-8?q?=EC=88=98=EB=B9=84=20=EC=84=A0=EC=A0=9C=EC=99=80=20=EA=B5=AC?=
 =?UTF-8?q?=EC=A1=B0=EC=A0=81=EC=9C=BC=EB=A1=9C=20=EB=8F=99=EC=9D=BC=20-?=
 =?UTF-8?q?=20=EC=B2=AB=EB=B2=88=EC=A7=B8=20=EC=83=81=EB=8C=80=EC=97=90?=
 =?UTF-8?q?=EA=B2=8C=20=EC=84=A0=EC=A0=9C=20=EC=82=AC=EA=B2=A9=20-=20?=
 =?UTF-8?q?=EA=B6=81=EB=B3=91=EA=B3=BC=20=EA=B6=81=EB=B3=91=EC=9D=98=20?=
 =?UTF-8?q?=EB=8C=80=EA=B2=B0=EC=9D=B8=20=EA=B2=BD=EC=9A=B0=20=ED=95=AD?=
 =?UTF-8?q?=EC=83=81=20=EB=A7=9E=20=EC=84=A0=EC=A0=9C=20=EC=82=AC=EA=B2=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/WarUnitTrigger/che_궁병선제사격.php | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/hwe/sammo/WarUnitTrigger/che_궁병선제사격.php b/hwe/sammo/WarUnitTrigger/che_궁병선제사격.php
index f203b740..78c753e0 100644
--- a/hwe/sammo/WarUnitTrigger/che_궁병선제사격.php
+++ b/hwe/sammo/WarUnitTrigger/che_궁병선제사격.php
@@ -28,23 +28,29 @@ class che_궁병선제사격 extends BaseWarUnitTrigger
         if ($self->hasActivatedSkillOnLog('선제')) {
             return true;
         }
+        if ($oppose->hasActivatedSkill('선제')){
+            //맞 선제는 한쪽에서 같이 처리
+            return true;
+        }
 
         $self->activateSkill('특수', '선제');
-        if (!$self->isAttacker()) {
-            $self->addPhase(-1);
-            $oppose->addPhase(-1);
-            if ($oppose->getCrewType()->armType == GameUnitConst::T_ARCHER) {
-                $oppose->multiplyWarPowerMultiply(0.5);
-            } else {
-                $oppose->multiplyWarPowerMultiply(0);
-                $self->multiplyWarPowerMultiply(0.5);
-                $self->activateSkill('회피불가', '필살불가', '계략불가');
-                $oppose->activateSkill('회피불가', '필살불가', '격노불가', '계략불가');
-            }
-        } else {
+        $self->addPhase(-1);
+        $oppose->addPhase(-1);
+        if ($oppose->getCrewType()->armType == GameUnitConst::T_ARCHER) {
+            $oppose->activateSkill('특수', '선제');
+
+            $self->multiplyWarPowerMultiply(0.5);
             $oppose->multiplyWarPowerMultiply(0.5);
+            $oppose->getLogger()->pushGeneralBattleDetailLog('서로 <C>선제 사격</>을 주고 받았다!</>', ActionLogger::PLAIN);
+            $self->getLogger()->pushGeneralBattleDetailLog('서로 <C>선제 사격</>을 주고 받았다!</>', ActionLogger::PLAIN);
+            return true;
         }
 
+        $oppose->multiplyWarPowerMultiply(0);
+        $self->multiplyWarPowerMultiply(0.5);
+        $self->activateSkill('회피불가', '필살불가', '계략불가');
+        $oppose->activateSkill('회피불가', '필살불가', '격노불가', '계략불가');
+
         $oppose->getLogger()->pushGeneralBattleDetailLog('상대에게 <R>선제 사격</>을 받았다!</>', ActionLogger::PLAIN);
         $self->getLogger()->pushGeneralBattleDetailLog('상대에게 <C>선제 사격</>을 했다!</>', ActionLogger::PLAIN);