Procházet zdrojové kódy

fixed isexistfield => IsExistOnBattleArea

mbunch_kascope před 1 rokem
rodič
revize
32c5b4d4ef
52 změnil soubory, kde provedl 126 přidání a 99 odebrání
  1. 3 2
      Assets/CardEffect/BT22/Black/BT22_005.cs
  2. 1 1
      Assets/CardEffect/BT22/Black/BT22_053.cs
  3. 2 2
      Assets/CardEffect/BT22/Black/BT22_054.cs
  4. 1 1
      Assets/CardEffect/BT22/Black/BT22_055.cs
  5. 2 2
      Assets/CardEffect/BT22/Black/BT22_056.cs
  6. 2 2
      Assets/CardEffect/BT22/Black/BT22_058.cs
  7. 3 3
      Assets/CardEffect/BT22/Black/BT22_059.cs
  8. 3 3
      Assets/CardEffect/BT22/Black/BT22_060.cs
  9. 3 3
      Assets/CardEffect/BT22/Black/BT22_061.cs
  10. 2 2
      Assets/CardEffect/BT22/Black/BT22_062.cs
  11. 4 4
      Assets/CardEffect/BT22/Black/BT22_063.cs
  12. 3 3
      Assets/CardEffect/BT22/Black/BT22_064.cs
  13. 3 3
      Assets/CardEffect/BT22/Black/BT22_065.cs
  14. 3 3
      Assets/CardEffect/BT22/Black/BT22_066.cs
  15. 3 3
      Assets/CardEffect/BT22/Black/BT22_067.cs
  16. 1 1
      Assets/CardEffect/BT22/Black/BT22_090.cs
  17. 2 2
      Assets/CardEffect/BT22/Black/BT22_101.cs
  18. 1 1
      Assets/CardEffect/BT22/Blue/BT22_001.cs
  19. 2 2
      Assets/CardEffect/BT22/Blue/BT22_017.cs
  20. 1 1
      Assets/CardEffect/BT22/Blue/BT22_018.cs
  21. 1 1
      Assets/CardEffect/BT22/Blue/BT22_020.cs
  22. 2 2
      Assets/CardEffect/BT22/Blue/BT22_021.cs
  23. 4 4
      Assets/CardEffect/BT22/Blue/BT22_023.cs
  24. 1 1
      Assets/CardEffect/BT22/Blue/BT22_024.cs
  25. 3 3
      Assets/CardEffect/BT22/Blue/BT22_025.cs
  26. 2 2
      Assets/CardEffect/BT22/Blue/BT22_026.cs
  27. 2 2
      Assets/CardEffect/BT22/Blue/BT22_027.cs
  28. 3 3
      Assets/CardEffect/BT22/Blue/BT22_028.cs
  29. 2 2
      Assets/CardEffect/BT22/Blue/BT22_085.cs
  30. 2 2
      Assets/CardEffect/BT22/Blue/BT22_086.cs
  31. 1 1
      Assets/CardEffect/BT22/Blue/BT22_096.cs
  32. 1 1
      Assets/CardEffect/BT22/Green/BT22_004.cs
  33. 2 2
      Assets/CardEffect/BT22/Green/BT22_043.cs
  34. 2 2
      Assets/CardEffect/BT22/Green/BT22_044.cs
  35. 1 1
      Assets/CardEffect/BT22/Green/BT22_046.cs
  36. 1 1
      Assets/CardEffect/BT22/Green/BT22_047.cs
  37. 2 2
      Assets/CardEffect/BT22/Green/BT22_048.cs
  38. 1 1
      Assets/CardEffect/BT22/Green/BT22_051.cs
  39. 1 1
      Assets/CardEffect/BT22/Purple/BT22_006.cs
  40. 1 1
      Assets/CardEffect/BT22/Purple/BT22_071.cs
  41. 4 4
      Assets/CardEffect/BT22/Red/BT22_008.cs
  42. 22 2
      Assets/CardEffect/BT22/Red/BT22_009.cs
  43. 1 1
      Assets/CardEffect/BT22/Red/BT22_010.cs
  44. 1 1
      Assets/CardEffect/BT22/Red/BT22_011.cs
  45. 1 1
      Assets/CardEffect/BT22/Red/BT22_012.cs
  46. 9 3
      Assets/CardEffect/BT22/White/BT22_007.cs
  47. 1 1
      Assets/CardEffect/BT22/White/BT22_079.cs
  48. 1 1
      Assets/CardEffect/BT22/White/BT22_080.cs
  49. 2 2
      Assets/CardEffect/BT22/White/BT22_081.cs
  50. 2 2
      Assets/CardEffect/BT22/White/BT22_082.cs
  51. 1 1
      Assets/CardEffect/BT22/Yellow/BT22_002.cs
  52. 1 1
      Assets/CardEffect/BT22/Yellow/BT22_003.cs

+ 3 - 2
Assets/CardEffect/BT22/Black/BT22_005.cs

@@ -26,12 +26,13 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanTriggerOnPermanentPlay(hashtable, PermanentCondition, null);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
+                           CardEffectCommons.CanTriggerOnPermanentPlay(hashtable, PermanentCondition, null);
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.IsOwnerTurn(card);
                 }
 

+ 1 - 1
Assets/CardEffect/BT22/Black/BT22_053.cs

@@ -51,7 +51,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 bool SelectArata(CardSource source)

+ 2 - 2
Assets/CardEffect/BT22/Black/BT22_054.cs

@@ -53,7 +53,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.IsOwnerTurn(card)
                         && CardEffectCommons.HasMatchConditionOpponentsPermanent(card, CanSelectPermanentCondition);
                 }
@@ -128,7 +128,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && card.PermanentOfThisCard().DigivolutionCards.Count >= 1
                         && card.PermanentOfThisCard().TopCard.HasCSTraits;
                 }

+ 1 - 1
Assets/CardEffect/BT22/Black/BT22_055.cs

@@ -74,7 +74,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.HasMatchConditionOwnersHand(card, IsAppmon);
                 }
 

+ 2 - 2
Assets/CardEffect/BT22/Black/BT22_056.cs

@@ -46,7 +46,7 @@ namespace DCGO.CardEffects.BT22
 
             bool SharedCanActivateCondition(Hashtable hashtable)
             {
-                return CardEffectCommons.IsExistOnField(card);
+                return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
             }
 
             IEnumerator SharedActivateCoroutine(Hashtable hashtable, ActivateClass activateClass)
@@ -171,7 +171,7 @@ namespace DCGO.CardEffects.BT22
             {
                 bool Condition()
                 {
-                    return CardEffectCommons.IsExistOnField(card) && CardEffectCommons.IsOpponentTurn(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) && CardEffectCommons.IsOpponentTurn(card);
                 }
 
                 cardEffects.Add(CardEffectFactory.ChangeSelfDPStaticEffect(changeValue: 2000, isInheritedEffect: true, card: card, condition: Condition));

+ 2 - 2
Assets/CardEffect/BT22/Black/BT22_058.cs

@@ -46,7 +46,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.HasMatchConditionOwnersPermanent(card, OtherDigimonCondition);
                 }
 
@@ -129,7 +129,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.HasMatchConditionOpponentsPermanent(card, OpponentCondition);
                 }
 

+ 3 - 3
Assets/CardEffect/BT22/Black/BT22_059.cs

@@ -52,7 +52,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 bool OpponentDigimon(Permanent permanent)
@@ -138,7 +138,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 bool OpponentDigimon(Permanent permanent)
@@ -226,7 +226,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 bool IsUnidentified(Permanent permanent)

+ 3 - 3
Assets/CardEffect/BT22/Black/BT22_060.cs

@@ -62,7 +62,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 void ActivateDeDigivolveProtection()
@@ -118,7 +118,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 void ActivateDeDigivolveProtection()
@@ -171,7 +171,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.IsOpponentTurn(card)
                         && CardEffectCommons.HasMatchConditionOpponentsPermanent(card, OpponentDigimon);
                 }

+ 3 - 3
Assets/CardEffect/BT22/Black/BT22_061.cs

@@ -222,7 +222,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 bool DeDigivolveCondition(Permanent targetPermanent)
@@ -362,7 +362,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 bool DeDigivolveCondition(Permanent targetPermanent)
@@ -505,7 +505,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.IsOpponentTurn(card)
                         && CanBeSwitched();
                 }

+ 2 - 2
Assets/CardEffect/BT22/Black/BT22_062.cs

@@ -64,7 +64,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 bool OpponentDigimon(Permanent permanent)
@@ -192,7 +192,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.IsOpponentTurn(card)
                         && CardEffectCommons.HasMatchConditionOpponentsPermanent(card, OpponentDigimon);
                 }

+ 4 - 4
Assets/CardEffect/BT22/Black/BT22_063.cs

@@ -146,7 +146,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.HasMatchConditionOpponentsPermanent(card, SharedOpponentDigimon);
                 }
 
@@ -180,7 +180,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
@@ -212,7 +212,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.HasMatchConditionOpponentsPermanent(card, SharedOpponentDigimon);
                 }
 
@@ -246,7 +246,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && HasSourceCondition();
                 }
 

+ 3 - 3
Assets/CardEffect/BT22/Black/BT22_064.cs

@@ -74,7 +74,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
@@ -106,7 +106,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
@@ -139,7 +139,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.HasMatchConditionOpponentsPermanent(card, IsOpponentsDigimon);
                 }
 

+ 3 - 3
Assets/CardEffect/BT22/Black/BT22_065.cs

@@ -98,7 +98,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.HasMatchConditionOpponentsPermanent(card, SharedOpponentDigimon);
                 }
 
@@ -131,7 +131,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.HasMatchConditionOpponentsPermanent(card, SharedOpponentDigimon);
                 }
 
@@ -165,7 +165,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.IsOwnerTurn(card)
                         && CardEffectCommons.HasMatchConditionOwnersPermanent(card, IsCSOnBoard);
                 }

+ 3 - 3
Assets/CardEffect/BT22/Black/BT22_066.cs

@@ -129,7 +129,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.HasMatchConditionPermanent(SharedDigimonCondition);
                 }
 
@@ -162,7 +162,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.HasMatchConditionPermanent(SharedDigimonCondition);
                 }
 
@@ -196,7 +196,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.HasMatchConditionOpponentsPermanent(card, IsOpponentDigimon);
                 }
 

+ 3 - 3
Assets/CardEffect/BT22/Black/BT22_067.cs

@@ -201,7 +201,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
@@ -233,7 +233,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
@@ -266,7 +266,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && card.Owner.LibraryCards.Count >= 3;
                 }
 

+ 1 - 1
Assets/CardEffect/BT22/Black/BT22_090.cs

@@ -37,7 +37,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleArea(card)
                         && CardEffectCommons.IsOwnerTurn(card)
                         && CardEffectCommons.HasMatchConditionOwnersPermanent(card, IsValidPermament)
                         && CardEffectCommons.HasMatchConditionOwnersHand(card, IsLordKnightmon);

+ 2 - 2
Assets/CardEffect/BT22/Black/BT22_101.cs

@@ -41,7 +41,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleArea(card)
                         && CardEffectCommons.CanActivateSuspendCostEffect(card);
                 }
 
@@ -114,7 +114,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleArea(card)
                         && CardEffectCommons.IsOwnerTurn(card)
                         && !CardEffectCommons.HasMatchConditionOwnersPermanent(card, perm => IsAlphaMon(perm.TopCard))
                         && CardEffectCommons.HasMatchConditionOwnersHand(card, IsAlphaMon);

+ 1 - 1
Assets/CardEffect/BT22/Blue/BT22_001.cs

@@ -31,7 +31,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.IsOwnerTurn(card);
                 }
 

+ 2 - 2
Assets/CardEffect/BT22/Blue/BT22_017.cs

@@ -55,7 +55,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 bool SelectOmnimonInText(CardSource source)
@@ -137,7 +137,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (isExistOnField(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                         return true;
                     }

+ 1 - 1
Assets/CardEffect/BT22/Blue/BT22_018.cs

@@ -110,7 +110,7 @@ namespace DCGO.CardEffects.BT22
             }
             #endregion
 
-            #region inherit
+            #region ESS
             if (timing == EffectTiming.None)
             {
                 cardEffects.Add(CardEffectFactory.JammingSelfStaticEffect(

+ 1 - 1
Assets/CardEffect/BT22/Blue/BT22_020.cs

@@ -103,7 +103,7 @@ namespace DCGO.CardEffects.BT22
             }
             #endregion
 
-            #region inherit
+            #region ESS
             if (timing == EffectTiming.None)
             {
                 cardEffects.Add(CardEffectFactory.JammingSelfStaticEffect(

+ 2 - 2
Assets/CardEffect/BT22/Blue/BT22_021.cs

@@ -49,7 +49,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.HasMatchConditionOwnersPermanent(card, IsValidDigimonCondition)
                         && CardEffectCommons.HasMatchConditionOwnersHand(card, IsValidHandCardCondition);
                 }
@@ -166,7 +166,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.HasMatchConditionOwnersPermanent(card, IsValidDigimonCondition)
                         && CardEffectCommons.HasMatchConditionOwnersHand(card, IsValidHandCardCondition);
                 }

+ 4 - 4
Assets/CardEffect/BT22/Blue/BT22_023.cs

@@ -47,7 +47,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.HasMatchConditionOpponentsPermanent(card, CanSelectPermanentCondition);
                 }
 
@@ -107,7 +107,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.HasMatchConditionOpponentsPermanent(card, CanSelectPermanentCondition);
                 }
 
@@ -163,7 +163,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.IsOwnerTurn(card)
                         && CardEffectCommons.HasMatchConditionOwnersPermanent(card, CanSelectPermanentCondition);
                 }
@@ -229,7 +229,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.HasMatchConditionOwnersPermanent(card, IsBlueTamer);
                 }
 

+ 1 - 1
Assets/CardEffect/BT22/Blue/BT22_024.cs

@@ -194,7 +194,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && card.PermanentOfThisCard().DigivolutionCards.Filter(x => CanSelectCardCondition(x)).Count >= 1;
                 }
 

+ 3 - 3
Assets/CardEffect/BT22/Blue/BT22_025.cs

@@ -56,7 +56,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 bool CanSelectOpponentDigimon(Permanent permanent)
@@ -205,7 +205,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 bool CanSelectOpponentDigimon(Permanent permanent)
@@ -354,7 +354,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.CanUnsuspend(card.PermanentOfThisCard());
                 }
 

+ 2 - 2
Assets/CardEffect/BT22/Blue/BT22_026.cs

@@ -142,7 +142,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 bool IsAgumon(Permanent permanent)
@@ -294,7 +294,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.CanUnsuspend(card.PermanentOfThisCard())
                         && card.PermanentOfThisCard().TopCard.ContainsCardName("Omnimon");
                 }

+ 2 - 2
Assets/CardEffect/BT22/Blue/BT22_027.cs

@@ -49,7 +49,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.HasMatchConditionOwnersHand(card, HandCondition)
                         && CardEffectCommons.HasMatchConditionOpponentsPermanent(card, PermanentCondition);
                 }
@@ -216,7 +216,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.HasMatchConditionOwnersHand(card, HandCondition)
                         && CardEffectCommons.HasMatchConditionOpponentsPermanent(card, PermanentCondition);
                 }

+ 3 - 3
Assets/CardEffect/BT22/Blue/BT22_028.cs

@@ -83,7 +83,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 bool DigimonCondition(int level, CardSource cardSource)
@@ -220,7 +220,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.HasMatchConditionOwnersPermanent(card, DigimonCondition);
                 }
 
@@ -328,7 +328,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.HasMatchConditionOwnersPermanent(card, DigimonCondition);
                 }
 

+ 2 - 2
Assets/CardEffect/BT22/Blue/BT22_085.cs

@@ -41,7 +41,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleArea(card)
                         && CardEffectCommons.HasMatchConditionOwnersPermanent(card, IsVeedramonInName);
                 }
 
@@ -116,7 +116,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleArea(card)
                         && CardEffectCommons.IsOwnerTurn(card);
                 }
 

+ 2 - 2
Assets/CardEffect/BT22/Blue/BT22_086.cs

@@ -27,7 +27,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleArea(card)
                         && CardEffectCommons.IsOwnerTurn(card);
                 }
 
@@ -195,7 +195,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleArea(card)
                         && CardEffectCommons.CanActivateSuspendCostEffect(card);
                 }
 

+ 1 - 1
Assets/CardEffect/BT22/Blue/BT22_096.cs

@@ -176,7 +176,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleArea(card);
                 }
 
                 bool IsYaoQinglan(Permanent permanent)

+ 1 - 1
Assets/CardEffect/BT22/Green/BT22_004.cs

@@ -33,7 +33,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.IsOwnerTurn(card)
                         && CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectEvoCondition);
                 }

+ 2 - 2
Assets/CardEffect/BT22/Green/BT22_043.cs

@@ -53,7 +53,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.IsOwnerTurn(card)
                         && CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectTamer)
                         && card.Owner.GetBattleAreaPermanents().Filter(x => x.IsTamer).Count <= 1;
@@ -135,7 +135,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && card.PermanentOfThisCard().DigivolutionCards.Count >= 1
                         && card.PermanentOfThisCard().TopCard.HasCSTraits;
                 }

+ 2 - 2
Assets/CardEffect/BT22/Green/BT22_044.cs

@@ -52,7 +52,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.IsOwnerTurn(card)
                         && card.Owner.CanAddMemory(activateClass);
                 }
@@ -96,7 +96,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && card.PermanentOfThisCard().DigivolutionCards.Count >= 1
                         && card.PermanentOfThisCard().TopCard.HasCSTraits;
                 }

+ 1 - 1
Assets/CardEffect/BT22/Green/BT22_046.cs

@@ -52,7 +52,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.IsOwnerTurn(card)
                         && CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectTamer)
                         && card.Owner.GetBattleAreaPermanents().Filter(x => x.IsTamer).Count <= 1;

+ 1 - 1
Assets/CardEffect/BT22/Green/BT22_047.cs

@@ -41,7 +41,7 @@ namespace DCGO.CardEffects.BT22
 
                 string EffectDiscription()
                 {
-                    return "[On Play] [When Digivolving] Suspend 1 of your opponent's Digimon. Then, if this Digimon's stack has 2 or more same-level cards, 1 of your opponent's Digimon can't unsuspend until their turn ends.";
+                    return "[On Play] Suspend 1 of your opponent's Digimon. Then, if this Digimon's stack has 2 or more same-level cards, 1 of your opponent's Digimon can't unsuspend until their turn ends.";
                 }
 
                 bool CanSelectOpponentDigimonCondition(Permanent permanent)

+ 2 - 2
Assets/CardEffect/BT22/Green/BT22_048.cs

@@ -53,7 +53,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
@@ -85,7 +85,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

+ 1 - 1
Assets/CardEffect/BT22/Green/BT22_051.cs

@@ -83,7 +83,7 @@ namespace DCGO.CardEffects.BT22
 
                 string EffectDiscription()
                 {
-                    return "[On Play] [When Digivolving] Suspend 1 of your opponent's Digimon. Then, if this Digimon's stack has 2 or more same-level cards, 1 of your opponent's Digimon can't unsuspend until their turn ends.";
+                    return "[On Play] Suspend 1 of your opponent's Digimon. Then, if this Digimon's stack has 2 or more same-level cards, 1 of your opponent's Digimon can't unsuspend until their turn ends.";
                 }
 
                 bool CanUseCondition(Hashtable hashtable)

+ 1 - 1
Assets/CardEffect/BT22/Purple/BT22_006.cs

@@ -32,7 +32,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.IsOwnerTurn(card);
                 }
 

+ 1 - 1
Assets/CardEffect/BT22/Purple/BT22_071.cs

@@ -52,7 +52,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.IsOwnerTurn(card)
                         && CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectTamer)
                         && card.Owner.GetBattleAreaPermanents().Filter(x => x.IsTamer).Count <= 1;

+ 4 - 4
Assets/CardEffect/BT22/Red/BT22_008.cs

@@ -53,15 +53,15 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card) && CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) && CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition);
                 }
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
                     return cardSource.IsDigimon
-                        && (cardSource.EqualsCardName("Greymon") ||
-                            cardSource.EqualsCardName("Garurumon") ||
-                            cardSource.EqualsCardName("Omnimon"));
+                        && (cardSource.ContainsCardName("Greymon") ||
+                            cardSource.ContainsCardName("Garurumon") ||
+                            cardSource.ContainsCardName("Omnimon"));
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

+ 22 - 2
Assets/CardEffect/BT22/Red/BT22_009.cs

@@ -33,6 +33,26 @@ namespace DCGO.CardEffects.BT22
 
             #endregion
 
+            #region Alternative Digivolution Condition
+
+            if (timing == EffectTiming.None)
+            {
+                bool PermanentCondition(Permanent targetPermanent)
+                {
+                    return targetPermanent.TopCard.EqualsTraits("Stnd.");
+                }
+
+                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(
+                    permanentCondition: PermanentCondition,
+                    digivolutionCost: 0,
+                    ignoreDigivolutionRequirement: false,
+                    card: card,
+                    condition: null)
+                );
+            }
+
+            #endregion
+
             #region Secuity
 
             if (timing == EffectTiming.SecuritySkill)
@@ -110,12 +130,12 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanTriggerWhenLinking(hashtable, permanent => permanent == card.PermanentOfThisCard().TopCard.PermanentOfThisCard(), card);
+                    return CardEffectCommons.CanTriggerWhenLinking(hashtable, null, card);
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card) && CardEffectCommons.HasMatchConditionOpponentsPermanent(card, SharedPermanentCondition);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) && CardEffectCommons.HasMatchConditionOpponentsPermanent(card, SharedPermanentCondition);
                 }
             }
 

+ 1 - 1
Assets/CardEffect/BT22/Red/BT22_010.cs

@@ -41,7 +41,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card) && CardEffectCommons.IsOwnerTurn(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) && CardEffectCommons.IsOwnerTurn(card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

+ 1 - 1
Assets/CardEffect/BT22/Red/BT22_011.cs

@@ -51,7 +51,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card) && CardEffectCommons.IsOwnerTurn(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) && CardEffectCommons.IsOwnerTurn(card);
                 }
 
                 bool CanSelectCardCondition(CardSource cardSource)

+ 1 - 1
Assets/CardEffect/BT22/Red/BT22_012.cs

@@ -55,7 +55,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.IsOwnerTurn(card)
                         && CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectTamer)
                         && card.Owner.GetBattleAreaPermanents().Filter(x => x.IsTamer).Count <= 1;

+ 9 - 3
Assets/CardEffect/BT22/White/BT22_007.cs

@@ -16,7 +16,7 @@ namespace DCGO.CardEffects.BT22
             if (timing == EffectTiming.OnStartMainPhase)
             {
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("Add [Mother Eater]s to top of stack. if 10 or more in digivolution source, play 3 [Mother Eater]s", null, card);
+                activateClass.SetUpICardEffect("Add [Mother Eater]s to top of stack. if 10 or more in digivolution source, play 3 [Mother Eater]s", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
                 cardEffects.Add(activateClass);
 
@@ -25,6 +25,11 @@ namespace DCGO.CardEffects.BT22
                     return "[Breeding] [Start of Your Main Phase] Look at your Digi-Egg deck's top card. Among them, you may place [Mother Eater]s as this Digimon's top digivolution cards. Then, if this Digimon has 10 or more digivolution cards, you may play 3 [Mother Eater]s from its digivolution cards without paying the costs.";
                 }
 
+                bool CanUseCondition(Hashtable hashtable)
+                {
+                    return CardEffectCommons.IsOwnerTurn(card);
+                }
+
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                     return CardEffectCommons.IsExistOnBreedingAreaDigimon(card);
@@ -155,12 +160,13 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanTriggerOnPlay(hashtable, card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) && 
+                           CardEffectCommons.CanTriggerOnPlay(hashtable, card);
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.HasMatchConditionOpponentsPermanent(card, CanSelectCondition);
                 }
 

+ 1 - 1
Assets/CardEffect/BT22/White/BT22_079.cs

@@ -42,7 +42,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

+ 1 - 1
Assets/CardEffect/BT22/White/BT22_080.cs

@@ -54,7 +54,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.HasMatchConditionOwnersBreedingPermanent(card, IsMotherEater)
                         && CardEffectCommons.HasMatchConditionPermanentDigivolutionCards(card, isEaterSpeciesForm);
                 }

+ 2 - 2
Assets/CardEffect/BT22/White/BT22_081.cs

@@ -57,7 +57,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 bool CanSelectOpponentsDigimonCondition(Permanent permanent)
@@ -219,7 +219,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 bool CanSelectOpponentsDigimonCondition(Permanent permanent)

+ 2 - 2
Assets/CardEffect/BT22/White/BT22_082.cs

@@ -60,7 +60,7 @@ namespace DCGO.CardEffects
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 bool CanSelectOpponentsDigimonCondition(Permanent permanent)
@@ -215,7 +215,7 @@ namespace DCGO.CardEffects
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
                 bool CanSelectOpponentsDigimonCondition(Permanent permanent)

+ 1 - 1
Assets/CardEffect/BT22/Yellow/BT22_002.cs

@@ -31,7 +31,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.IsOwnerTurn(card);
                 }
 

+ 1 - 1
Assets/CardEffect/BT22/Yellow/BT22_003.cs

@@ -32,7 +32,7 @@ namespace DCGO.CardEffects.BT22
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnField(card)
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.IsOwnerTurn(card)
                         && CardEffectCommons.HasMatchConditionOpponentsPermanent(card, OpponentCondition);
                 }