Przeglądaj źródła

taiki and medusa token

mbunch_kascope 1 rok temu
rodzic
commit
e296e79495

+ 1 - 5
Assets/CardEffect/BT21/Red/BT21_029_token.cs

@@ -64,11 +64,7 @@ namespace DCGO.CardEffects.Tokens
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
-                    {
-                        return true;
-                    }
-                    return false;
+                    return card.Owner.SecurityCards.Count > 0;
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

+ 22 - 17
Assets/CardEffect/BT21/Red/BT21_083.cs

@@ -43,10 +43,10 @@ namespace DCGO.CardEffects.BT21
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectDigimon))
                         {
-                            return false;
+                            return true;
                         }
                     }
-                    return true;
+                    return false;
                 }
 
                 bool CanSelectDigimon(CardSource card)
@@ -157,30 +157,35 @@ namespace DCGO.CardEffects.BT21
                     return CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card);
                 }
 
-                bool AttackingPermanentCondition(Permanent permanent)
+                
+
+                IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
-                    if (playedPermanents.Contains(permanent))
+                    yield return ContinuousController.instance.StartCoroutine(new SuspendPermanentsClass(new List<Permanent>() { card.PermanentOfThisCard() }, CardEffectCommons.CardEffectHashtable(activateClass)).Tap());
+
+                    foreach(Hashtable hash in CardEffectCommons.GetHashtablesFromHashtable(hashtable))
+                    {
+                        playedPermanents.Add(CardEffectCommons.GetPermanentFromHashtable(hash));
+                    }
+
+                    bool AttackingPermanentCondition(Permanent permanent)
                     {
-                        if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card))
+                        if (playedPermanents.Contains(permanent))
                         {
-                            if (permanent.TopCard.EqualsTraits("Xros Heart") || permanent.TopCard.EqualsTraits("Hero"))
+                            if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card))
                             {
-                                if (permanent.CanAttack(activateClass))
+                                if (permanent.TopCard.EqualsTraits("Xros Heart") || permanent.TopCard.EqualsTraits("Hero"))
                                 {
-                                    return true;
+                                    if (permanent.CanAttack(activateClass))
+                                    {
+                                        return true;
+                                    }
                                 }
                             }
                         }
-                    }
-                    
-                    return false;
-                }
-
-                IEnumerator ActivateCoroutine(Hashtable hashtable)
-                {
-                    yield return ContinuousController.instance.StartCoroutine(new SuspendPermanentsClass(new List<Permanent>() { card.PermanentOfThisCard() }, CardEffectCommons.CardEffectHashtable(activateClass)).Tap());
 
-                    playedPermanents = CardEffectCommons.GetPermanentsFromHashtable(hashtable);
+                        return false;
+                    }
 
                     if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, AttackingPermanentCondition))
                     {