Merge remote-tracking branch 'upstream/develop' into Remove-PhotonWaitController

Assets/CardBaseEntity.meta

@@ -1,9 +1,5 @@
 fileFormatVersion: 2
-<<<<<<< HEAD
 guid: 0bb04d6ac99220141918b14c218e9b07
-=======
-guid: e993b749780a99048849c6d4786d68d4
->>>>>>> c84de76e09c9f8431d54e166c567e26909d5a3d8
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/CardBaseEntity/BT25/Yellow/Digimon/BT25_044.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fcc1d5819730979f5b3d8240c48e701b8a29d044a1cf754b1096084757a26770
-size 1806
+oid sha256:55eee0bee2a15fa73cac63d7c79c3f291e01f50aff4a0142c6ff3356da7a88b0
+size 1804

Assets/CardBaseEntity/BT25/Yellow/Digimon/BT25_044_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:81a4c2b1cec0623b966bfa5c4227ee31dcf1db040f6bff96917a5b4d471d601b
-size 1812
+oid sha256:798bfd2bdadface95054c6072350793c0ee1d583dc91f7f69c6975742b8f78cc
+size 1810

Assets/Scripts/CardEffect/AD1/Purple/AD1_018.cs

@@ -15,13 +15,7 @@ namespace DCGO.CardEffects.AD1
             #region Reduce Play Cost
             if (timing == EffectTiming.None)
             {
-                ChangeCostClass changeCostClass = new ChangeCostClass();
-                changeCostClass.SetUpICardEffect("Play Cost -5", CanUseCondition, card);
-                changeCostClass.SetUpChangeCostClass(changeCostFunc: ChangeCost, cardSourceCondition: CardSourceCondition, rootCondition: RootCondition, isUpDown: isUpDown, isCheckAvailability: () => false, isChangePayingCost: () => true);
-                changeCostClass.SetNotShowUI(true);
-                cardEffects.Add(changeCostClass);
-
-                bool CanUseCondition(Hashtable hashtable)
+                bool Condition()
                 {
                     return CardEffectCommons.HasMatchConditionOwnersPermanent(card, WouldPlayCondition);
                 }
@@ -32,38 +26,7 @@ namespace DCGO.CardEffects.AD1
                             && (permanent.TopCard.ContainsCardName("Knightmon") || permanent.TopCard.ContainsCardName("Lucemon"));
                 }
 
-                int ChangeCost(CardSource cardSource, int cost, SelectCardEffect.Root root,
-                        List<Permanent> targetPermanents)
-                {
-                    if (CardSourceCondition(cardSource) &&
-                        RootCondition(root) &&
-                        PermanentsCondition(targetPermanents))
-                    {
-                        cost -= 5;
-                    }
-
-                    return cost;
-                }
-
-                bool PermanentsCondition(List<Permanent> targetPermanents)
-                {
-                    return targetPermanents == null || targetPermanents.Count(targetPermanent => targetPermanent != null) == 0;
-                }
-
-                bool CardSourceCondition(CardSource cardSource)
-                {
-                    return cardSource == card;
-                }
-
-                bool RootCondition(SelectCardEffect.Root root)
-                {
-                    return true;
-                }
-
-                bool isUpDown()
-                {
-                    return true;
-                }
+                cardEffects.Add(CardEffectFactory.MandatorySelfPlayCostReduction(5, card, Condition));
             }
             #endregion
 

Assets/Scripts/CardEffect/AD1/Yellow/AD1_017.cs

@@ -14,13 +14,7 @@ namespace DCGO.CardEffects.AD1
             #region Reduce Play Cost
             if (timing == EffectTiming.None)
             {
-                ChangeCostClass changeCostClass = new ChangeCostClass();
-                changeCostClass.SetUpICardEffect("Play Cost -5", CanUseCondition, card);
-                changeCostClass.SetUpChangeCostClass(changeCostFunc: ChangeCost, cardSourceCondition: CardSourceCondition, rootCondition: RootCondition, isUpDown: isUpDown, isCheckAvailability: () => false, isChangePayingCost: () => true);
-                changeCostClass.SetNotShowUI(true);
-                cardEffects.Add(changeCostClass);
-
-                bool CanUseCondition(Hashtable hashtable)
+                bool Condition()
                 {
                     return CardEffectCommons.MatchConditionOwnersCardCountInTrash(card, WouldPlayCondition) >= 4;
                 }
@@ -31,38 +25,7 @@ namespace DCGO.CardEffects.AD1
                             || cardSource.HasText("Witchelny");
                 }
 
-                int ChangeCost(CardSource cardSource, int cost, SelectCardEffect.Root root,
-                        List<Permanent> targetPermanents)
-                {
-                    if (CardSourceCondition(cardSource) &&
-                        RootCondition(root) &&
-                        PermanentsCondition(targetPermanents))
-                    {
-                        cost -= 5;
-                    }
-
-                    return cost;
-                }
-
-                bool PermanentsCondition(List<Permanent> targetPermanents)
-                {
-                    return targetPermanents == null || targetPermanents.Count(targetPermanent => targetPermanent != null) == 0;
-                }
-
-                bool CardSourceCondition(CardSource cardSource)
-                {
-                    return cardSource == card;
-                }
-
-                bool RootCondition(SelectCardEffect.Root root)
-                {
-                    return true;
-                }
-
-                bool isUpDown()
-                {
-                    return true;
-                }
+                cardEffects.Add(CardEffectFactory.MandatorySelfPlayCostReduction(5, card, Condition));
             }
             #endregion
 

Assets/Scripts/CardEffect/BT1/Blue/BT1_030.cs

@@ -32,7 +32,7 @@ public class BT1_030 : CEntity_Effect
 
             bool CanActivateCondition(Hashtable hashtable)
             {
-                if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                 {
                     if (card.Owner.CanAddMemory(activateClass))
                     {

Assets/Scripts/CardEffect/BT1/Blue/BT1_035.cs

@@ -31,7 +31,7 @@ public class BT1_035 : CEntity_Effect
 
             bool CanActivateCondition(Hashtable hashtable)
             {
-                if (CardEffectCommons.CanActivateOnDeletion(card))
+                if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                 {
                     if (card.Owner.CanAddMemory(activateClass))
                     {

Assets/Scripts/CardEffect/BT10/Black/BT10_061.cs

@@ -144,7 +144,7 @@ namespace DCGO.CardEffects.BT10
                         activateClass: activateClass
                         ));
 
-                    if (CardEffectCommons.IsDijiXros(_hashtable, (count) => count == 2))
+                    if (CardEffectCommons.IsDijiXros(_hashtable, card, (count) => count == 2))
                     {
                         int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
 

Assets/Scripts/CardEffect/BT10/Black/BT10_066.cs

@@ -95,7 +95,7 @@ namespace DCGO.CardEffects.BT10
                         }
                     }
 
-                    if (CardEffectCommons.IsDijiXros(_hashtable, (count) => count == 2))
+                    if (CardEffectCommons.IsDijiXros(_hashtable, card, (count) => count == 2))
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition1))
                         {

Assets/Scripts/CardEffect/BT10/Black/BT10_069.cs

@@ -175,7 +175,7 @@ namespace DCGO.CardEffects.BT10
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {

Assets/Scripts/CardEffect/BT10/Black/BT10_092.cs

@@ -139,7 +139,7 @@ namespace DCGO.CardEffects.BT10
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.CanAddMemory(activateClass))
                         {

Assets/Scripts/CardEffect/BT10/Blue/BT10_018.cs

@@ -61,7 +61,7 @@ namespace DCGO.CardEffects.BT10
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         {

Assets/Scripts/CardEffect/BT10/Blue/BT10_024.cs

@@ -72,7 +72,7 @@ namespace DCGO.CardEffects.BT10
                         effectDuration: EffectDuration.UntilEachTurnEnd,
                         activateClass: activateClass));
 
-                    if (CardEffectCommons.IsDijiXros(_hashtable, (digixrosCount) => digixrosCount >= 1))
+                    if (CardEffectCommons.IsDijiXros(_hashtable, card, (digixrosCount) => digixrosCount >= 1))
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {

Assets/Scripts/CardEffect/BT10/Green/BT10_056.cs

@@ -181,7 +181,7 @@ namespace DCGO.CardEffects.BT10
 
                         bool CanActivateCondition1(Hashtable hashtable)
                         {
-                            if (CardEffectCommons.CanActivateOnDeletion(cardSource))
+                            if (CardEffectCommons.CanActivateOnDeletion(hashtable, cardSource))
                             {
                                 return true;
                             }

Assets/Scripts/CardEffect/BT10/Purple/BT10_078.cs

@@ -80,7 +80,7 @@ namespace DCGO.CardEffects.BT10
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {

Assets/Scripts/CardEffect/BT10/Purple/BT10_080.cs

@@ -229,7 +229,7 @@ namespace DCGO.CardEffects.BT10
 
                             bool CanActivateCondition1(Hashtable hashtable1)
                             {
-                                if (CardEffectCommons.CanActivateOnDeletion(card))
+                                if (CardEffectCommons.CanActivateOnDeletion(hashtable1, card))
                                 {
                                     if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                                     {

Assets/Scripts/CardEffect/BT10/Purple/BT10_081.cs

@@ -103,7 +103,7 @@ namespace DCGO.CardEffects.BT10
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {

Assets/Scripts/CardEffect/BT10/Purple/BT10_083.cs

@@ -175,7 +175,7 @@ namespace DCGO.CardEffects.BT10
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {

Assets/Scripts/CardEffect/BT11/Black/BT11_071.cs

@@ -506,7 +506,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition))
                         {

Assets/Scripts/CardEffect/BT11/Black/BT11_072.cs

@@ -259,7 +259,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.GetBattleAreaPermanents().Count(CanSelectPermanentCondition) >= 1)
                         {

Assets/Scripts/CardEffect/BT11/Blue/BT11_031.cs

@@ -186,7 +186,7 @@ namespace DCGO.CardEffects.BT11
                         return true;
                     }
 
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.GetBattleAreaPermanents().Count(CanSelectPermanentCondition1) >= 1)
                         {

Assets/Scripts/CardEffect/BT11/Purple/BT11_079.cs

@@ -33,7 +33,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.LibraryCards.Count >= 1)
                         {

Assets/Scripts/CardEffect/BT11/Purple/BT11_082.cs

@@ -118,7 +118,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {

Assets/Scripts/CardEffect/BT11/Purple/BT11_086.cs

@@ -105,7 +105,7 @@ namespace DCGO.CardEffects.BT11
 
                         int maxCount = 1;
 
-                        if (CardEffectCommons.IsDijiXros(_hashtable, (digixrosCount) => digixrosCount >= 1))
+                        if (CardEffectCommons.IsDijiXros(_hashtable, card, (digixrosCount) => digixrosCount >= 1))
                         {
                             maxCount += 1;
                         }
@@ -221,19 +221,6 @@ namespace DCGO.CardEffects.BT11
                     {
                         List<CardSource> selectedCards = new List<CardSource>();
 
-                        int maxCount = 1;
-
-                        if (CardEffectCommons.IsDijiXros(_hashtable, (digixrosCount) => digixrosCount >= 1))
-                        {
-                            maxCount += 1;
-                        }
-
-                        maxCount = Math.Min(maxCount,
-                            card.Owner.TrashCards.Count(CanSelectCardCondition));
-
-                        maxCount = Math.Min(maxCount,
-                            card.Owner.fieldCardFrames.Count((frame) => frame.IsEmptyFrame() && frame.IsBattleAreaFrame()));
-
                         SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
 
                         selectCardEffect.SetUp(
@@ -244,7 +231,7 @@ namespace DCGO.CardEffects.BT11
                                     selectCardCoroutine: SelectCardCoroutine,
                                     afterSelectCardCoroutine: null,
                                     message: "Select cards to play.",
-                                    maxCount: maxCount,
+                                    maxCount: 1,
                                     canEndNotMax: false,
                                     isShowOpponent: true,
                                     mode: SelectCardEffect.Mode.Custom,

Assets/Scripts/CardEffect/BT11/Red/BT11_001.cs

@@ -29,7 +29,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.LibraryCards.Count >= 1)
                         {

Assets/Scripts/CardEffect/BT11/Red/BT11_007.cs

@@ -115,7 +115,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.CanAddMemory(activateClass))
                         {

Assets/Scripts/CardEffect/BT11/Red/BT11_009.cs

@@ -100,23 +100,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
-                    {
-                        if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
-                        {
-                            return true;
-                        }
-
-                        if (CardEffectCommons.IsDijiXros(hashtable, count => count == 2))
-                        {
-                            if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition1))
-                            {
-                                return true;
-                            }
-                        }
-                    }
-
-                    return false;
+                    return CardEffectCommons.IsExistOnBattleArea(card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
@@ -150,7 +134,7 @@ namespace DCGO.CardEffects.BT11
                         }
                     }
 
-                    if (CardEffectCommons.IsDijiXros(_hashtable, count => count == 2))
+                    if (CardEffectCommons.IsDijiXros(_hashtable, card, count => count == 2))
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition1))
                         {

Assets/Scripts/CardEffect/BT11/Red/BT11_011.cs

@@ -54,7 +54,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         {

Assets/Scripts/CardEffect/BT11/Red/BT11_016.cs

@@ -200,7 +200,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         {

Assets/Scripts/CardEffect/BT11/Yellow/BT11_036.cs

@@ -83,7 +83,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {

Assets/Scripts/CardEffect/BT11/Yellow/BT11_038.cs

@@ -49,7 +49,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {

Assets/Scripts/CardEffect/BT11/Yellow/BT11_040.cs

@@ -48,7 +48,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.LibraryCards.Count >= 1)
                         {

Assets/Scripts/CardEffect/BT12/Purple/BT12_006.cs

@@ -29,7 +29,7 @@ namespace DCGO.CardEffects.BT12
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.LibraryCards.Count >= 1)
                         {

Assets/Scripts/CardEffect/BT12/Red/BT12_012.cs

@@ -67,7 +67,7 @@ namespace DCGO.CardEffects.BT12
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         {
@@ -157,7 +157,7 @@ namespace DCGO.CardEffects.BT12
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         {

Assets/Scripts/CardEffect/BT13/Black/BT13_061.cs

@@ -38,7 +38,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.LibraryCards.Count >= 1)
                         {

Assets/Scripts/CardEffect/BT13/Black/BT13_062.cs

@@ -192,7 +192,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {

Assets/Scripts/CardEffect/BT13/Purple/BT13_006.cs

@@ -46,7 +46,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         {

Assets/Scripts/CardEffect/BT13/Purple/BT13_079.cs

@@ -112,7 +112,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (!CardEffectCommons.IsByBattle(hashtable))
                         {

Assets/Scripts/CardEffect/BT13/Purple/BT13_082.cs

@@ -35,7 +35,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (!CardEffectCommons.IsByBattle(hashtable))
                         {

Assets/Scripts/CardEffect/BT13/Purple/BT13_083.cs

@@ -418,7 +418,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.TrashCards.Count(CanSelectCardCondition) >= 2)
                         {

Assets/Scripts/CardEffect/BT13/Purple/BT13_085.cs

@@ -106,7 +106,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (!CardEffectCommons.IsByBattle(hashtable))
                         {

Assets/Scripts/CardEffect/BT13/Red/BT13_001.cs

@@ -43,7 +43,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {

Assets/Scripts/CardEffect/BT13/Red/BT13_010.cs

@@ -152,7 +152,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.LibraryCards.Count >= 1)
                         {

Assets/Scripts/CardEffect/BT13/Red/BT13_011.cs

@@ -168,7 +168,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.LibraryCards.Count >= 1)
                         {

Assets/Scripts/CardEffect/BT13/Red/BT13_014.cs

@@ -223,7 +223,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {

Assets/Scripts/CardEffect/BT13/White/BT13_093.cs

@@ -99,7 +99,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.HandCards.Count(CanSelectCardCondition) >= 1)
                         {

Assets/Scripts/CardEffect/BT13/Yellow/BT13_041.cs

@@ -57,7 +57,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         {

Assets/Scripts/CardEffect/BT14/Black/BT14_063.cs

@@ -59,7 +59,7 @@ namespace DCGO.CardEffects.BT14
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.LibraryCards.Count >= 1)
                         {

Assets/Scripts/CardEffect/BT14/Black/BT14_066.cs

@@ -225,7 +225,7 @@ namespace DCGO.CardEffects.BT14
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         {

Assets/Scripts/CardEffect/BT14/Purple/BT14_075.cs

@@ -127,7 +127,7 @@ namespace DCGO.CardEffects.BT14
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.Enemy.HandCards.Count >= 1)
                         {

Assets/Scripts/CardEffect/BT14/Purple/BT14_078.cs

@@ -122,7 +122,7 @@ namespace DCGO.CardEffects.BT14
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card);
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)

Assets/Scripts/CardEffect/BT14/Yellow/BT14_032.cs

@@ -140,7 +140,7 @@ namespace DCGO.CardEffects.BT14
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {

Assets/Scripts/CardEffect/BT14/Yellow/BT14_034.cs

@@ -40,7 +40,7 @@ namespace DCGO.CardEffects.BT14
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {

Assets/Scripts/CardEffect/BT14/Yellow/BT14_038.cs

@@ -153,7 +153,7 @@ namespace DCGO.CardEffects.BT14
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.CanAddSecurity(activateClass))
                         {
@@ -198,7 +198,7 @@ namespace DCGO.CardEffects.BT14
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.TrashCards.Some(CanSelectCardCondition))
                         {

Assets/Scripts/CardEffect/BT14/Yellow/BT14_102.cs

@@ -212,7 +212,7 @@ namespace DCGO.CardEffects.BT14
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.CanAddSecurity(activateClass))
                         {
@@ -270,7 +270,7 @@ namespace DCGO.CardEffects.BT14
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         {

Assets/Scripts/CardEffect/BT15/Black/BT15_057.cs

@@ -73,7 +73,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {
@@ -173,7 +173,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {

Assets/Scripts/CardEffect/BT15/Black/BT15_066.cs

@@ -46,10 +46,7 @@ namespace DCGO.CardEffects.BT15
 
             #region Shared OP/WA
 
-            string SharedEffectName()
-            {
-                return "De-Digivolve 2 on 1 Digimon.";
-            }
+            string SharedEffectName = "De-Digivolve 2 on 1 Digimon.";
 
             string SharedEffectDescription(string tag)
             {
@@ -99,41 +96,14 @@ namespace DCGO.CardEffects.BT15
                 }
             }
 
-            #endregion
-
-            #region On Play
-
-            if (timing == EffectTiming.OnEnterFieldAnyone)
-            {
-                ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect(SharedEffectName(), CanUseCondition, card);
-                activateClass.SetUpActivateClass(SharedCanActivateCondition, (hash) => SharedActivateCoroutine(hash, activateClass), -1, false, SharedEffectDescription("On Play"));
-                cardEffects.Add(activateClass);
-
-                bool CanUseCondition(Hashtable hashtable)
-                {
-                    return CardEffectCommons.CanTriggerOnPlay(hashtable, card)
-                        && CardEffectCommons.IsExistOnBattleArea(card);
-                }
-            }
-
-            #endregion
-
-            #region When Attacking
-
-            if (timing == EffectTiming.OnAllyAttack)
-            {
-                ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect(SharedEffectName(), CanUseCondition, card);
-                activateClass.SetUpActivateClass(SharedCanActivateCondition, (hash) => SharedActivateCoroutine(hash, activateClass), -1, false, SharedEffectDescription("When Attacking"));
-                cardEffects.Add(activateClass);
-
-                bool CanUseCondition(Hashtable hashtable)
-                {
-                    return CardEffectCommons.CanTriggerOnAttack(hashtable, card)
-                        && CardEffectCommons.IsExistOnBattleArea(card);
-                }
-            }
+            CardEffectFactory.ActivateClassesForSharedEffects
+                (ref cardEffects, timing, card,
+                    SharedEffectName,
+                    SharedActivateCoroutine,
+                    SharedEffectDescription,
+                    optional: false,
+                    onPlay: true,
+                    whenAttacking: true);
 
             #endregion
           
@@ -177,25 +147,13 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
-                    {
-                        if (CardEffectCommons.IsOpponentTurn(card))
-                        {
-                            return true;
-                        }
-                    }
-
-                    return false;
+                    return CardEffectCommons.IsExistOnBattleAreaTrigger(card, activateClass)
+                        && CardEffectCommons.IsOpponentTurn(card);
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
-                    {
-                        return true;
-                    }
-
-                    return false;
+                    return CardEffectCommons.IsExistOnBattleAreaActivate(card, activateClass);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)

Assets/Scripts/CardEffect/BT15/Blue/BT15_030.cs

@@ -153,7 +153,7 @@ namespace DCGO.CardEffects.BT15
                 {
                     if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                     {
-                        if (CardEffectCommons.CanActivateOnDeletion(card))
+                        if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                         {
                             return true;
                         }

Assets/Scripts/CardEffect/BT15/Green/BT15_044.cs

@@ -34,7 +34,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {

Assets/Scripts/CardEffect/BT15/Purple/BT15_006.cs

@@ -46,7 +46,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         {

Assets/Scripts/CardEffect/BT15/Purple/BT15_069.cs

@@ -28,7 +28,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.Enemy.MemoryForPlayer <= 1)
                         {

Assets/Scripts/CardEffect/BT15/Purple/BT15_073.cs

@@ -90,7 +90,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         return true;
                     }

Assets/Scripts/CardEffect/BT15/Purple/BT15_078.cs

@@ -148,7 +148,7 @@ namespace DCGO.CardEffects.BT15
 
                             bool CanActivateCondition1(Hashtable hashtable)
                             {
-                                if (CardEffectCommons.CanActivateOnDeletion(cardSource))
+                                if (CardEffectCommons.CanActivateOnDeletion(hashtable, cardSource))
                                 {
                                     return true;
                                 }

Assets/Scripts/CardEffect/BT15/Purple/BT15_080.cs

@@ -175,7 +175,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {

Assets/Scripts/CardEffect/BT15/Red/BT15_001.cs

@@ -44,7 +44,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition))
                         {

Assets/Scripts/CardEffect/BT15/Red/BT15_012.cs

@@ -170,7 +170,7 @@ namespace DCGO.CardEffects.BT15
 
                         IEnumerator AfterSelectPermanentCoroutine(List<Permanent> permanents)
                         {
-                            if (CardEffectCommons.IsDijiXros(_hashtable, count => count == 2))
+                            if (CardEffectCommons.IsDijiXros(_hashtable, card, count => count == 2))
                             {
                                 foreach (Permanent selectedPermanent in permanents)
                                 {

Assets/Scripts/CardEffect/BT15/Red/BT15_016.cs

@@ -309,7 +309,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {

Assets/Scripts/CardEffect/BT15/Red/BT15_017.cs

@@ -116,7 +116,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.Enemy.SecurityCards.Count <= 3)
                         {

Assets/Scripts/CardEffect/BT15/Yellow/BT15_035.cs

@@ -210,7 +210,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         {

Assets/Scripts/CardEffect/BT15/Yellow/BT15_036.cs

@@ -31,7 +31,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.SecurityCards.Count >= 1)
                         {

Assets/Scripts/CardEffect/BT15/Yellow/BT15_041.cs

@@ -105,7 +105,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card);
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card);
                 }
 
                 bool CanUseCondition(Hashtable hashtable)
@@ -173,7 +173,7 @@ namespace DCGO.CardEffects.BT15
 
                 string EffectDiscription()
                 {
-                    return "[End of Opponent�'s Turn] By deleting this Digimon, you may play 1 [Rosemon] or [Jijimon] from your hand without paying the cost. Then activate the [When Digivolving] effect of the Digimon played by this effect.";
+                    return "[End of Opponent�'s Turn] By deleting this Digimon, you may play 1 [Rosemon] or [Jijimon] from your hand without paying the cost. Then activate the [When Digivolving] effect of the Digimon played by this effect.";
                 }
 
                 bool CanUseCondition(Hashtable hashtable)

Assets/Scripts/CardEffect/BT16/Purple/BT16_006.cs

@@ -31,7 +31,7 @@ namespace DCGO.CardEffects.BT16
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         {

Assets/Scripts/CardEffect/BT16/Purple/BT16_072.cs

@@ -125,7 +125,7 @@ namespace DCGO.CardEffects.BT16
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition))
                         {

Assets/Scripts/CardEffect/BT16/Purple/BT16_073.cs

@@ -139,7 +139,7 @@ namespace DCGO.CardEffects.BT16
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition))
                         {

Assets/Scripts/CardEffect/BT16/Purple/BT16_089.cs

@@ -244,7 +244,7 @@ namespace DCGO.CardEffects.BT16
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.TrashCards.Count >= 1)
                         {

Assets/Scripts/CardEffect/BT16/Red/BT16_010.cs

@@ -166,7 +166,7 @@ namespace DCGO.CardEffects.BT16
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card);
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)

Assets/Scripts/CardEffect/BT16/Red/BT16_011.cs

@@ -320,7 +320,7 @@ namespace DCGO.CardEffects.BT16
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.Enemy.SecurityCards.Count >= 1)
                         {

Assets/Scripts/CardEffect/BT16/Red/BT16_015.cs

@@ -161,7 +161,7 @@ namespace DCGO.CardEffects.BT16
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card);
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)

Assets/Scripts/CardEffect/BT17/Black/BT17_005.cs

@@ -30,7 +30,7 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if(CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if(CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if(CardEffectCommons.CanActivateSelfOnDeletionWithContainingTrait(hashtable, "Unidentified", card))
                             return true;

Assets/Scripts/CardEffect/BT17/Black/BT17_053.cs

@@ -103,7 +103,7 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (CardEffectCommons.CanActivateSelfOnDeletionWithContainingTrait(hashtable, "Unidentified", card))
                         {

Assets/Scripts/CardEffect/BT17/Green/BT17_042.cs

@@ -119,7 +119,7 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card);
+                    return CardEffectCommons.CanActivateOnDeletion( hashtable, card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

Assets/Scripts/CardEffect/BT17/Green/BT17_045.cs

@@ -147,7 +147,7 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card);
+                    return CardEffectCommons.CanActivateOnDeletion( hashtable, card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

Assets/Scripts/CardEffect/BT17/Green/BT17_046.cs

@@ -41,7 +41,7 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if(CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, IsTerriermon))
                         {

Assets/Scripts/CardEffect/BT17/Green/BT17_048.cs

@@ -104,7 +104,7 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if(CardEffectCommons.HasMatchConditionOwnersHand(card, IsLevel6Argomon))
                         {

Assets/Scripts/CardEffect/BT17/Purple/BT17_068.cs

@@ -215,7 +215,7 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card) &&
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card) &&
                            (card.Owner.HandCards.Some(CanSelectCardCondition) ||
                             card.Owner.TrashCards.Some(CanSelectCardCondition));
                 }

Assets/Scripts/CardEffect/BT17/Red/BT17_009.cs

@@ -132,7 +132,7 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.HandCards.Count(CanSelectCardCondition) >= 1)
                         {

Assets/Scripts/CardEffect/BT17/White/BT17_102.cs

@@ -177,7 +177,7 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card);
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
@@ -289,7 +289,7 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card);
+                    return CardEffectCommons.CanActivateOnDeletion( hashtable, card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

Assets/Scripts/CardEffect/BT18/Black/BT18_073.cs

@@ -402,7 +402,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card) &&
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card) &&
                            CardEffectCommons.HasMatchConditionPermanent(HasKimeramon) &&
                            CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, HasMachinedramon) &&
                            CardEffectCommons.HasMatchConditionOwnersHand(card, HasMillenniummon);

Assets/Scripts/CardEffect/BT18/Purple/BT18_006.cs

@@ -47,7 +47,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card);
+                    return CardEffectCommons.CanActivateOnDeletion( hashtable, card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

Assets/Scripts/CardEffect/BT18/Purple/BT18_078.cs

@@ -415,7 +415,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card) &&
+                    return CardEffectCommons.CanActivateOnDeletion( hashtable, card) &&
                            CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition);
                 }
 

Assets/Scripts/CardEffect/BT18/Red/BT18_015.cs

@@ -271,7 +271,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card) &&
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card) &&
                            CardEffectCommons.HasMatchConditionPermanent(HasMachinedramon) &&
                            CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, HasKimeramon) &&
                            CardEffectCommons.HasMatchConditionOwnersHand(card, HasMillenniummon);

Assets/Scripts/CardEffect/BT18/Red/BT18_019.cs

@@ -128,7 +128,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaTrigger(card, activateClass))
                         return CardEffectCommons.CanTriggerWhenDigivolving(hashtable, card);
 
                     return false;
@@ -136,7 +136,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
+                    return CardEffectCommons.IsExistOnBattleAreaActivate(card, activateClass);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
@@ -265,7 +265,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaTrigger(card, activateClass))
                         return CardEffectCommons.CanTriggerOnPlay(hashtable, card);
 
                     return false;
@@ -273,7 +273,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaActivate(card, activateClass))
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {
@@ -378,7 +378,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardConditionKimeramon) || CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardConditionMachinedramon))
                         {

Assets/Scripts/CardEffect/BT18/Yellow/BT18_038.cs

@@ -146,7 +146,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.HandCards.Count(CanSelectCardCondition) >= 1)
                         {
@@ -220,7 +220,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.CanAddSecurity(activateClass))
                         {

Assets/Scripts/CardEffect/BT18/Yellow/BT18_041.cs

@@ -356,7 +356,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {

Assets/Scripts/CardEffect/BT19/Black/BT19_055.cs

@@ -41,7 +41,7 @@ namespace DCGO.CardEffects.BT19
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card);
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

Assets/Scripts/CardEffect/BT19/Black/BT19_061.cs

@@ -189,7 +189,7 @@ namespace DCGO.CardEffects.BT19
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card) &&
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card) &&
                            CardEffectCommons.HasMatchConditionOwnersPermanent(card, IsOwnTamerCondition) &&
                            (CardEffectCommons.HasMatchConditionOwnersHand(card, HasTraitCondition) ||
                             CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, HasTraitCondition));

Assets/Scripts/CardEffect/BT19/Black/BT19_063.cs

@@ -167,7 +167,7 @@ namespace DCGO.CardEffects.BT19
                         }
                     }
 
-                    if (CardEffectCommons.IsDijiXros(_hashtable, (count) => count == 2))
+                    if (CardEffectCommons.IsDijiXros(_hashtable, card, (count) => count == 2))
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition1))
                         {
@@ -272,31 +272,6 @@ namespace DCGO.CardEffects.BT19
                             yield return ContinuousController.instance.StartCoroutine(new IDegeneration(permanent, 1, activateClass).Degeneration());
                         }
                     }
-
-                    if (CardEffectCommons.IsDijiXros(_hashtable, (count) => count == 2))
-                    {
-                        if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition1))
-                        {
-                            int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition1));
-
-                            SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
-
-                            selectPermanentEffect.SetUp(
-                                selectPlayer: card.Owner,
-                                canTargetCondition: CanSelectPermanentCondition1,
-                                canTargetCondition_ByPreSelecetedList: null,
-                                canEndSelectCondition: null,
-                                maxCount: maxCount,
-                                canNoSelect: true,
-                                canEndNotMax: false,
-                                selectPermanentCoroutine: null,
-                                afterSelectPermanentCoroutine: null,
-                                mode: SelectPermanentEffect.Mode.Destroy,
-                                cardEffect: activateClass);
-
-                            yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
-                        }
-                    }
                 }
             }
             #endregion
@@ -354,7 +329,7 @@ namespace DCGO.CardEffects.BT19
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card) &&
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card) &&
                            CardEffectCommons.HasMatchConditionPermanent(TamerHasDigimon);
                 }
 
@@ -474,7 +449,7 @@ namespace DCGO.CardEffects.BT19
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card) &&
+                    return CardEffectCommons.CanActivateOnDeletion( hashtable, card) &&
                            CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, HasKnightmonInText);
                 }
 

Assets/Scripts/CardEffect/BT19/Black/BT19_065.cs

@@ -233,7 +233,7 @@ namespace DCGO.CardEffects.BT19
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card) &&
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card) &&
                            CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, IsTargetableDigimon);
                 }
 

Assets/Scripts/CardEffect/BT19/Blue/BT19_016.cs

@@ -151,7 +151,7 @@ namespace DCGO.CardEffects.BT19
                 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card) &&
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card) &&
                            CardEffectCommons.HasMatchConditionOwnersHand(card, HasBlueFlareTraitCondition) &&
                            CardEffectCommons.HasMatchConditionOwnersPermanent(card, IsOwnTamerCondition);
                 }

Assets/Scripts/CardEffect/BT19/Blue/BT19_020.cs

@@ -57,7 +57,7 @@ namespace DCGO.CardEffects.BT19
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card) &&
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card) &&
                            ((CardEffectCommons.HasMatchConditionOwnersHand(card, IsTamerCardCondition) &&
                              card.Owner.GetBattleAreaPermanents().Count(permanent => permanent.IsTamer) <= 1) ||
                             CardEffectCommons.CanActivateSave(hashtable, CanSelectSaveTamerPermanentCondition));