mbunch_kascope 9 месяцев назад
Родитель
Сommit
ec2c43d71f

+ 10 - 11
Assets/CardEffect/BT23/Black/BT23_060.cs

@@ -260,21 +260,20 @@ namespace DCGO.CardEffects.BT23
                     return "[When Attacking] [Once Per Turn] Activate 1 [On Play] effect on a face-up [Zaxon] trait Digimon card in your security stack as an effect of this Digimon.";
                 }
 
-                bool CanSelectCardCondition(CardSource cardSource)
+                bool OnPlayEffectSecurityCondition(CardSource cardSource)
                 {
+                    List<ICardEffect> effects = cardSource.EffectList_ForCard(EffectTiming.OnEnterFieldAnyone, cardSource)
+                            .Clone()
+                            .Filter(cardEffect => cardEffect != null && cardEffect is ActivateICardEffect && !cardEffect.IsSecurityEffect && cardEffect.IsOnPlay);
 
-                    bool OnPlayEffectSecurityCondition(CardSource cardSource)
-                    {
-                        List<ICardEffect> effects = cardSource.EffectList_ForCard(EffectTiming.OnEnterFieldAnyone, cardSource)
-                                .Clone()
-                                .Filter(cardEffect => cardEffect != null && cardEffect is ActivateICardEffect && !cardEffect.IsSecurityEffect && cardEffect.IsOnPlay);
-
-                        if (effects.Count > 0)
-                            return true;
+                    if (effects.Count > 0)
+                        return true;
 
-                        return false;
-                    }
+                    return false;
+                }
 
+                bool CanSelectCardCondition(CardSource cardSource)
+                {
                     return cardSource.EqualsTraits("Zaxon")
                     && !cardSource.IsFlipped
                     && OnPlayEffectSecurityCondition(cardSource);

+ 1 - 0
Assets/CardEffect/BT23/White/BT23_077.cs

@@ -63,6 +63,7 @@ namespace DCGO.CardEffects.BT23
                 bool IsOpponenetsDigimon(Permanent permanent)
                 {
                     return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card) &&
+                        permanent.TopCard.HasPlayCost &&
                         permanent.TopCard.GetCostItself <= 4;
                 }
 

+ 1 - 1
Assets/CardEffect/BT23/White/BT23_099.cs

@@ -27,7 +27,7 @@ namespace DCGO.CardEffects.BT23
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.HasMatchConditionPermanent(HasHuckmon);
+                    return CardEffectCommons.HasMatchConditionPermanent(HasHuckmon, true);
                 }
 
                 bool CardCondition(CardSource cardSource)