Просмотр исходного кода

Merge pull request #1554 from DCGO2/hooperk-EX12-004

Update EX12-004 with Execute
x89rt2 1 месяц назад
Родитель
Сommit
ee129f6edd

+ 1 - 1
Assets/Scripts/CardEffect/EX12/Purple/EX12_004.cs

@@ -17,7 +17,7 @@ namespace DCGO.CardEffects.EX12
                     return card.PermanentOfThisCard().TopCard.EqualsTraits("TB");
                 }
 
-                cardEffects.Add(CardEffectFactory.FortitudeSelfEffect(isInheritedEffect: true, card: card, condition: PermanentCondition));
+                cardEffects.Add(CardEffectFactory.ExecuteSelfEffect(isInheritedEffect: true, card: card, condition: PermanentCondition));
             }
             #endregion
             return cardEffects;

+ 2 - 1
Assets/Scripts/Script/CardEffectFactory/KeyWordEffects/Execute.cs

@@ -46,7 +46,8 @@ public partial class CardEffectFactory
         bool CanUseCondition(Hashtable hashtable)
         {
             return CardEffectCommons.IsExistOnBattleArea(card) &&
-                   CardEffectCommons.IsOwnerTurn(card);
+                   CardEffectCommons.IsOwnerTurn(card) &&
+                   (condition == null || condition());
         }
 
         bool CanActivateCondition(Hashtable hashtable)