From 1b46a06eee87d4c528b195a9d6b282485acd2ce3 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Aug 2021 20:26:31 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EC=95=84=EC=9D=B4=ED=85=9C=EC=A4=91=20W?=
 =?UTF-8?q?arActivateSkill=20=EA=B4=80=EB=A0=A8=20=EC=A4=91=EC=B2=A9=20?=
 =?UTF-8?q?=ED=95=B4=EC=A0=9C=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/ActionItem/che_부적_태현청생부.php  | 21 +++++++++++-------
 hwe/sammo/ActionItem/event_전투특기_반계.php  |  2 +-
 .../ActionSpecialDomestic/che_event_견고.php  |  6 ++---
 .../ActionSpecialDomestic/che_event_반계.php  | 17 +++++++++-----
 hwe/sammo/ActionSpecialWar/che_견고.php       | 22 ++++++++++++-------
 hwe/sammo/ActionSpecialWar/che_반계.php       |  2 +-
 6 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/hwe/sammo/ActionItem/che_부적_태현청생부.php b/hwe/sammo/ActionItem/che_부적_태현청생부.php
index 4badf3a7..1094880a 100644
--- a/hwe/sammo/ActionItem/che_부적_태현청생부.php
+++ b/hwe/sammo/ActionItem/che_부적_태현청생부.php
@@ -1,5 +1,7 @@
 <?php
+
 namespace sammo\ActionItem;
+
 use \sammo\iAction;
 use \sammo\General;
 use \sammo\GeneralTrigger;
@@ -10,7 +12,8 @@ use sammo\BaseWarUnitTrigger;
 use sammo\WarUnitTrigger\che_부상무효;
 use sammo\WarUnitTrigger\WarActivateSkills;
 
-class che_부적_태현청생부 extends \sammo\BaseItem{
+class che_부적_태현청생부 extends \sammo\BaseItem
+{
 
     protected $id = 9;
     protected $rawName = '태현청생부';
@@ -19,16 +22,18 @@ class che_부적_태현청생부 extends \sammo\BaseItem{
     protected $cost = 200;
     protected $consumable = false;
 
-    public function getBattleInitSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+    public function getBattleInitSkillTriggerList(WarUnit $unit): ?WarUnitTriggerCaller
+    {
         return new WarUnitTriggerCaller(
-            new che_부상무효($unit, BaseWarUnitTrigger::TYPE_NONE),
-            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_NONE, false, '저격불가')
+            new che_부상무효($unit, BaseWarUnitTrigger::TYPE_ITEM + BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE * 303),
+            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_ITEM + BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE * 303, false, '저격불가')
         );
     }
-    
-    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+
+    public function getBattlePhaseSkillTriggerList(WarUnit $unit): ?WarUnitTriggerCaller
+    {
         return new WarUnitTriggerCaller(
-            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_NONE, false, '저격불가')
+            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_ITEM + BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE * 303, false, '저격불가')
         );
     }
-}
\ No newline at end of file
+}
diff --git a/hwe/sammo/ActionItem/event_전투특기_반계.php b/hwe/sammo/ActionItem/event_전투특기_반계.php
index 5cab0605..372d4de1 100644
--- a/hwe/sammo/ActionItem/event_전투특기_반계.php
+++ b/hwe/sammo/ActionItem/event_전투특기_반계.php
@@ -30,7 +30,7 @@ class event_전투특기_반계 extends \sammo\BaseItem{
 
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
-            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_NONE, false, '계략약화'),
+            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_ITEM + BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*401, false, '계략약화'),
             new che_반계시도($unit),
             new che_반계발동($unit)
         );
diff --git a/hwe/sammo/ActionSpecialDomestic/che_event_견고.php b/hwe/sammo/ActionSpecialDomestic/che_event_견고.php
index 9b9da034..902682da 100644
--- a/hwe/sammo/ActionSpecialDomestic/che_event_견고.php
+++ b/hwe/sammo/ActionSpecialDomestic/che_event_견고.php
@@ -23,14 +23,14 @@ class che_event_견고 extends \sammo\BaseSpecial{
 
     public function getBattleInitSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
-            new che_부상무효($unit, BaseWarUnitTrigger::TYPE_NONE),
-            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_NONE, false, '저격불가')
+            new che_부상무효($unit, BaseWarUnitTrigger::TYPE_ITEM),
+            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_ITEM + BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*402, false, '저격불가')
         );
     }
 
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
-            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_NONE, false, '필살불가', '계략약화', '저격불가')
+            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_ITEM + BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*402, false, '필살불가', '계략약화', '저격불가')
         );
     }
 
diff --git a/hwe/sammo/ActionSpecialDomestic/che_event_반계.php b/hwe/sammo/ActionSpecialDomestic/che_event_반계.php
index 60a8e2b4..ec5b6c28 100644
--- a/hwe/sammo/ActionSpecialDomestic/che_event_반계.php
+++ b/hwe/sammo/ActionSpecialDomestic/che_event_반계.php
@@ -1,5 +1,7 @@
 <?php
+
 namespace sammo\ActionSpecialDomestic;
+
 use \sammo\iAction;
 use \sammo\General;
 use \sammo\SpecialityHelper;
@@ -10,7 +12,8 @@ use \sammo\WarUnitTrigger\WarActivateSkills;
 use \sammo\WarUnitTrigger\che_반계시도;
 use \sammo\WarUnitTrigger\che_반계발동;
 
-class che_event_반계 extends \sammo\BaseSpecial{
+class che_event_반계 extends \sammo\BaseSpecial
+{
 
     protected $id = 45;
     protected $name = '반계';
@@ -22,18 +25,20 @@ class che_event_반계 extends \sammo\BaseSpecial{
         SpecialityHelper::STAT_INTEL,
     ];
 
-    public function onCalcStat(General $general, string $statName, $value, $aux=null){
-        if($statName === 'warMagicSuccessDamage' && $aux === '반목'){
+    public function onCalcStat(General $general, string $statName, $value, $aux = null)
+    {
+        if ($statName === 'warMagicSuccessDamage' && $aux === '반목') {
             return $value + 0.9;
         }
         return $value;
     }
 
-    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+    public function getBattlePhaseSkillTriggerList(WarUnit $unit): ?WarUnitTriggerCaller
+    {
         return new WarUnitTriggerCaller(
-            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_NONE, false, '계략약화'),
+            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_ITEM + BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE * 403, false, '계략약화'),
             new che_반계시도($unit),
             new che_반계발동($unit)
         );
     }
-}
\ No newline at end of file
+}
diff --git a/hwe/sammo/ActionSpecialWar/che_견고.php b/hwe/sammo/ActionSpecialWar/che_견고.php
index 7a9d814b..3e3e0d5b 100644
--- a/hwe/sammo/ActionSpecialWar/che_견고.php
+++ b/hwe/sammo/ActionSpecialWar/che_견고.php
@@ -1,5 +1,7 @@
 <?php
+
 namespace sammo\ActionSpecialWar;
+
 use \sammo\iAction;
 use \sammo\General;
 use \sammo\SpecialityHelper;
@@ -9,7 +11,8 @@ use sammo\BaseWarUnitTrigger;
 use sammo\WarUnitTrigger\che_부상무효;
 use sammo\WarUnitTrigger\WarActivateSkills;
 
-class che_견고 extends \sammo\BaseSpecial{
+class che_견고 extends \sammo\BaseSpecial
+{
 
     protected $id = 62;
     protected $name = '견고';
@@ -21,20 +24,23 @@ class che_견고 extends \sammo\BaseSpecial{
         SpecialityHelper::STAT_STRENGTH
     ];
 
-    public function getBattleInitSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+    public function getBattleInitSkillTriggerList(WarUnit $unit): ?WarUnitTriggerCaller
+    {
         return new WarUnitTriggerCaller(
-            new che_부상무효($unit, BaseWarUnitTrigger::TYPE_NONE),
-            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_NONE, false, '저격불가')
+            new che_부상무효($unit, BaseWarUnitTrigger::TYPE_ITEM + BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE * 404),
+            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_ITEM + BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE * 404, false, '저격불가')
         );
     }
 
-    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+    public function getBattlePhaseSkillTriggerList(WarUnit $unit): ?WarUnitTriggerCaller
+    {
         return new WarUnitTriggerCaller(
-            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_NONE, false, '필살불가', '계략약화', '저격불가')
+            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_ITEM + BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE * 404, false, '필살불가', '계략약화', '저격불가')
         );
     }
 
-    public function getWarPowerMultiplier(WarUnit $unit):array{
+    public function getWarPowerMultiplier(WarUnit $unit): array
+    {
         return [1, 0.9];
     }
-}
\ No newline at end of file
+}
diff --git a/hwe/sammo/ActionSpecialWar/che_반계.php b/hwe/sammo/ActionSpecialWar/che_반계.php
index 9657fc3c..4d2117d5 100644
--- a/hwe/sammo/ActionSpecialWar/che_반계.php
+++ b/hwe/sammo/ActionSpecialWar/che_반계.php
@@ -31,7 +31,7 @@ class che_반계 extends \sammo\BaseSpecial{
 
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
-            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_NONE, false, '계략약화'),
+            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_ITEM + BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE * 406, false, '계략약화'),
             new che_반계시도($unit),
             new che_반계발동($unit)
         );