PR changes

Assets/CardEffect/EX7/Red/ChaosTriangular_EX7_066.cs

@@ -17,7 +17,7 @@ namespace DCGO.CardEffects.EX7
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("+3000DP", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
+                activateClass.SetUpActivateClass(null, ActivateCoroutine, -1, false, EffectDiscription());
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
@@ -26,15 +26,12 @@ namespace DCGO.CardEffects.EX7
                 }
 
                 bool CanUseCondition(Hashtable hashtable)
-                {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))  
-                    {                 
-                       if (CardEffectCommons.CanTriggerOnTrashSelfDigivolutionCard(hashtable, cardEffect => cardEffect != null, card))
-                       {
-                           return true;
-                       }                        
-                    }
-
+                {    
+                    if (CardEffectCommons.CanTriggerOnTrashSelfDigivolutionCard(hashtable, cardEffect => cardEffect != null, card))
+                    {
+                        return true;
+                    }                        
+                     
                     return false;
                 }
 
@@ -43,16 +40,6 @@ namespace DCGO.CardEffects.EX7
                     return CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card);
                 }
 
-                bool CanActivateCondition(Hashtable hashtable)
-                {
-                    if (CardEffectCommons.IsExistOnTrash(card))
-                    {
-                        return true;
-                    }
-
-                    return false;
-                }
-
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 {
                     if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
@@ -149,7 +136,7 @@ namespace DCGO.CardEffects.EX7
 
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Delete 1 Digimon", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
+                activateClass.SetUpActivateClass(null, ActivateCoroutine, -1, false, EffectDiscription());
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
@@ -188,19 +175,6 @@ namespace DCGO.CardEffects.EX7
                     return CardEffectCommons.CanTriggerOptionMainEffect(hashtable, card);
                 }
 
-                bool CanActivateCondition(Hashtable hashtable)
-                {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
-                    {
-                        if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
-                        {
-                            return true;
-                        }
-                    }
-
-                    return false;
-                }
-
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 {
                     if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
@@ -267,7 +241,7 @@ namespace DCGO.CardEffects.EX7
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect($"Delete 1 Digimon with 12000 DP or less", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
+                activateClass.SetUpActivateClass(null, ActivateCoroutine, -1, false, EffectDiscription());
                 activateClass.SetIsSecurityEffect(true);
                 cardEffects.Add(activateClass);
 
@@ -294,19 +268,6 @@ namespace DCGO.CardEffects.EX7
                     return CardEffectCommons.CanTriggerSecurityEffect(hashtable, card);
                 }
 
-                bool CanActivateCondition(Hashtable hashtable)
-                {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
-                    {
-                        if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
-                        {
-                            return true;
-                        }
-                    }
-
-                    return false;
-                }
-
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 {
                     if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))

Assets/CardEffect/EX7/Red/DemiMeramon_EX7_001.cs

@@ -14,7 +14,7 @@ namespace DCGO.CardEffects.EX7
             {
                 bool Condition()
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                         if (CardEffectCommons.IsOwnerTurn(card))
                         {

Assets/CardEffect/EX7/Red/Deputymon_EX7_010.cs

@@ -30,6 +30,7 @@ namespace DCGO.CardEffects.EX7
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Trash 1 Option from the digivolution cards", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
+                activateClass.SetHashString("TrashOption_EX7_010");
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
@@ -71,19 +72,9 @@ namespace DCGO.CardEffects.EX7
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanTriggerWhenDigivolving(hashtable, card);
-                }
-
-                bool CanActivateCondition(Hashtable hashtable)
-                {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
-                        if (card.Owner.HandCards.Count >= 1)
-                        {
-                            return true;
-                        }
-
-                        if (card.Owner.GetBattleAreaPermanents().Count(CanSelectPermanentCondition) >= 1)
+                        if(CardEffectCommons.CanTriggerWhenDigivolving(hashtable, card))
                         {
                             return true;
                         }
@@ -92,52 +83,27 @@ namespace DCGO.CardEffects.EX7
                     return false;
                 }
 
-                IEnumerator ActivateCoroutine(Hashtable _hashtable)
+                bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (card.Owner.HandCards.Count(CanSelectCardCondition) >= 1)
-                    {
-                        List<CardSource> discardCards = new List<CardSource>();
-
-                        int maxCount = Math.Min(1, card.Owner.HandCards.Count(CanSelectCardCondition));
-
-                        SelectHandEffect selectHandEffect = GManager.instance.GetComponent<SelectHandEffect>();
-
-                        selectHandEffect.SetUp(
-                            selectPlayer: card.Owner,
-                            canTargetCondition: CanSelectCardCondition,
-                            canTargetCondition_ByPreSelecetedList: null,
-                            canEndSelectCondition: null,
-                            maxCount: maxCount,
-                            canNoSelect: true,
-                            canEndNotMax: true,
-                            isShowOpponent: true,
-                            selectCardCoroutine: null,
-                            afterSelectCardCoroutine: AfterSelectCardCoroutine,
-                            mode: SelectHandEffect.Mode.Discard,
-                            cardEffect: activateClass);
-
-                        yield return StartCoroutine(selectHandEffect.Activate());
-
-                        IEnumerator AfterSelectCardCoroutine(List<CardSource> cardSources)
-                        {
-                            if (cardSources.Count >= 1)
-                            {
-                                discardCards = cardSources.Clone();
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
+                    {                      
+                        return true;                       
+                    }
 
-                                yield return null;
-                            }
-                        }
+                    return false;
+                }
 
-                        yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.SelectTrashDigivolutionCards(
-                            permanentCondition: CanSelectPermanentCondition,
-                            cardCondition: CanSelectCardCondition,
-                            maxCount: discardCards.Count,
-                            canNoTrash: true,
-                            isFromOnly1Permanent: false,
-                            activateClass: activateClass,
-                            selectString: "Digimon"
-                        ));
-                    }
+                IEnumerator ActivateCoroutine(Hashtable _hashtable)
+                {                      
+                     yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.SelectTrashDigivolutionCards(
+                         permanentCondition: CanSelectPermanentCondition,
+                         cardCondition: CanSelectCardCondition,
+                         maxCount: 1,
+                         canNoTrash: true,
+                         isFromOnly1Permanent: false,
+                         activateClass: activateClass,
+                         selectString: "Digimon"
+                     ));                 
                 }
             }
             #endregion
@@ -148,6 +114,7 @@ namespace DCGO.CardEffects.EX7
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Trash 1 Option from the digivolution cards", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
+                activateClass.SetHashString("TrashOption_EX7_010");
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
@@ -189,19 +156,9 @@ namespace DCGO.CardEffects.EX7
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanTriggerOnAttack(hashtable, card);
-                }
-
-                bool CanActivateCondition(Hashtable hashtable)
-                {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
-                        if (card.Owner.HandCards.Count >= 1)
-                        {
-                            return true;
-                        }
-
-                        if (card.Owner.GetBattleAreaPermanents().Count(CanSelectPermanentCondition) >= 1)
+                        if (CardEffectCommons.CanTriggerOnAttack(hashtable, card))
                         {
                             return true;
                         }
@@ -210,52 +167,27 @@ namespace DCGO.CardEffects.EX7
                     return false;
                 }
 
-                IEnumerator ActivateCoroutine(Hashtable _hashtable)
+                bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (card.Owner.HandCards.Count(CanSelectCardCondition) >= 1)
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
-                        List<CardSource> discardCards = new List<CardSource>();
-
-                        int maxCount = Math.Min(1, card.Owner.HandCards.Count(CanSelectCardCondition));
-
-                        SelectHandEffect selectHandEffect = GManager.instance.GetComponent<SelectHandEffect>();
-
-                        selectHandEffect.SetUp(
-                            selectPlayer: card.Owner,
-                            canTargetCondition: CanSelectCardCondition,
-                            canTargetCondition_ByPreSelecetedList: null,
-                            canEndSelectCondition: null,
-                            maxCount: maxCount,
-                            canNoSelect: true,
-                            canEndNotMax: true,
-                            isShowOpponent: true,
-                            selectCardCoroutine: null,
-                            afterSelectCardCoroutine: AfterSelectCardCoroutine,
-                            mode: SelectHandEffect.Mode.Discard,
-                            cardEffect: activateClass);
-
-                        yield return StartCoroutine(selectHandEffect.Activate());
-
-                        IEnumerator AfterSelectCardCoroutine(List<CardSource> cardSources)
-                        {
-                            if (cardSources.Count >= 1)
-                            {
-                                discardCards = cardSources.Clone();
+                        return true;
+                    }
 
-                                yield return null;
-                            }
-                        }
+                    return false;
+                }
 
-                        yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.SelectTrashDigivolutionCards(
-                            permanentCondition: CanSelectPermanentCondition,
-                            cardCondition: CanSelectCardCondition,
-                            maxCount: discardCards.Count,
-                            canNoTrash: true,
-                            isFromOnly1Permanent: false,
-                            activateClass: activateClass,
-                            selectString: "Digimon"
-                        ));
-                    }
+                IEnumerator ActivateCoroutine(Hashtable _hashtable)
+                {
+                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.SelectTrashDigivolutionCards(
+                        permanentCondition: CanSelectPermanentCondition,
+                        cardCondition: CanSelectCardCondition,
+                        maxCount: 1,
+                        canNoTrash: true,
+                        isFromOnly1Permanent: false,
+                        activateClass: activateClass,
+                        selectString: "Digimon"
+                    ));
                 }
             }
             #endregion
@@ -270,7 +202,7 @@ namespace DCGO.CardEffects.EX7
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                         if (CardEffectCommons.IsOwnerTurn(card))
                         {
@@ -300,7 +232,10 @@ namespace DCGO.CardEffects.EX7
                 {
                     if (CardEffectCommons.IsOwnerTurn(card))
                     {
-                        return true;
+                        if(CardEffectCommons.IsExistOnBattleAreaDigimon(card))
+                        {
+                            return true;
+                        }                      
                     }
 
                     return false;

Assets/CardEffect/EX7/Red/Lavogaritamon_EX7_012.cs

@@ -44,7 +44,7 @@ namespace DCGO.CardEffects.EX7
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {
@@ -97,12 +97,20 @@ namespace DCGO.CardEffects.EX7
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanTriggerWhenDigivolving(hashtable, card);
+                    if(CardEffectCommons.IsExistOnBattleAreaDigimon(card))
+                    {
+                        if(CardEffectCommons.CanTriggerWhenDigivolving(hashtable, card))
+                        {
+                            return true;
+                        }
+                    }
+                    
+                    return false;
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (isExistOnField(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                         if (card.Owner.Enemy.GetBattleAreaDigimons().Count((permanent) => permanent.DP <= 6000) == 0)
                         {
@@ -118,7 +126,7 @@ namespace DCGO.CardEffects.EX7
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 {
-                    if (isExistOnField(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                         if (card.Owner.CanAddMemory(activateClass))
                         {

Assets/CardEffect/EX7/Red/Lavorvomon_EX7_009.cs

@@ -56,12 +56,20 @@ namespace DCGO.CardEffects.EX7
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanTriggerOnPlay(hashtable, card);
+                    if(CardEffectCommons.IsExistOnBattleAreaDigimon(card))
+                    {
+                        if (CardEffectCommons.CanTriggerOnPlay(hashtable, card))
+                        {
+                            return true;
+                        }
+                    }
+
+                    return false;
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (isExistOnField(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition))
                         {
@@ -146,7 +154,7 @@ namespace DCGO.CardEffects.EX7
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         {
@@ -204,10 +212,13 @@ namespace DCGO.CardEffects.EX7
             {
                 bool Condition()
                 {
-                    if (CardEffectCommons.IsOwnerTurn(card))
+                    if(CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
-                        return true;
-                    }
+                        if (CardEffectCommons.IsOwnerTurn(card))
+                        {
+                            return true;
+                        }
+                    }                
 
                     return false;
                 }

Assets/CardEffect/EX7/Red/MagnaKidmon_EX7_013.cs

@@ -63,7 +63,7 @@ namespace DCGO.CardEffects.EX7
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                         return true;
                     }
@@ -167,12 +167,20 @@ namespace DCGO.CardEffects.EX7
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanTriggerWhenDigivolving(hashtable, card);
+                    if(CardEffectCommons.IsExistOnBattleAreaDigimon(card))
+                    {
+                        if(CardEffectCommons.CanTriggerWhenDigivolving(hashtable, card))
+                        {
+                            return true;
+                        }
+                    }
+
+                    return false;                    
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                         return true;
                     }
@@ -276,7 +284,7 @@ namespace DCGO.CardEffects.EX7
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                         if (CardEffectCommons.IsOwnerTurn(card))
                         {
@@ -289,7 +297,7 @@ namespace DCGO.CardEffects.EX7
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                         if (card.PermanentOfThisCard().DigivolutionCards.Count(CanSelectCardCondition) >= 1)
                         {
@@ -302,155 +310,152 @@ namespace DCGO.CardEffects.EX7
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
-                    {
-                        bool trashed = false;
-
-                        List<CardSource> selectedCards = new List<CardSource>();
-
-                        SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
-
-                        selectCardEffect.SetUp(
-                                    canTargetCondition: CanSelectCardCondition,
-                                    canTargetCondition_ByPreSelecetedList: null,
-                                    canEndSelectCondition: null,
-                                    canNoSelect: () => true,
-                                    selectCardCoroutine: SelectCardCoroutine,
-                                    afterSelectCardCoroutine: null,
-                                    message: "Select 1 Option card to discard.",
-                                    maxCount: 1,
-                                    canEndNotMax: false,
-                                    isShowOpponent: true,
-                                    mode: SelectCardEffect.Mode.Custom,
-                                    root: SelectCardEffect.Root.Custom,
-                                    customRootCardList: card.PermanentOfThisCard().DigivolutionCards,
-                                    canLookReverseCard: true,
-                                    selectPlayer: card.Owner,
-                                    cardEffect: null);
-
-                        selectCardEffect.SetUpCustomMessage("Select 1 Option card to discard.", "The opponent is selecting 1 Option card to discard.");
-
-                        yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
-
-                        IEnumerator SelectCardCoroutine(CardSource cardSource)
-                        {
-                            selectedCards.Add(cardSource);
-
-                            yield return null;
-                        }
-
-                        if (selectedCards.Count >= 1)
-                        {
-                            yield return ContinuousController.instance.StartCoroutine(new ITrashDigivolutionCards(card.PermanentOfThisCard(), selectedCards, activateClass).TrashDigivolutionCards());
-
-                            trashed = true;
-                        }
-
-                        if (trashed)
-                        {
-                            if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
-                            {
-                                int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
-
-                                SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
-
-                                selectPermanentEffect.SetUp(
-                                    selectPlayer: card.Owner,
-                                    canTargetCondition: CanSelectPermanentCondition,
-                                    canTargetCondition_ByPreSelecetedList: null,
-                                    canEndSelectCondition: null,
-                                    maxCount: maxCount,
-                                    canNoSelect: false,
-                                    canEndNotMax: false,
-                                    selectPermanentCoroutine: SelectPermanentCoroutine,
-                                    afterSelectPermanentCoroutine: null,
-                                    mode: SelectPermanentEffect.Mode.Custom,
-                                    cardEffect: activateClass);
-
-                                selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon that will get Security Attack +1.", "The opponent is selecting 1 Digimon that will get Security Attack +1.");
-
-                                yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
-
-                                IEnumerator SelectPermanentCoroutine(Permanent permanent)
-                                {
-                                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonSAttack(targetPermanent: permanent, changeValue: 1, effectDuration: EffectDuration.UntilEachTurnEnd, activateClass: activateClass));
-
-                                    Permanent selectedPermanent = permanent;
-
-                                    if (selectedPermanent != null)
-                                    {
-                                        ActivateClass activateClass1 = new ActivateClass();
-                                        activateClass1.SetUpICardEffect("Attack with this Digimon", CanUseCondition1, selectedPermanent.TopCard);
-                                        activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
-                                        activateClass1.SetEffectSourcePermanent(selectedPermanent);
-
-                                        if (!permanent.TopCard.CanNotBeAffected(activateClass))
-                                        {
-                                            yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(selectedPermanent));
-                                        }
-
-                                        string EffectDiscription1()
-                                        {
-                                            return "[Start of Your Main Phase] Attack with this Digimon.";
-                                        }
-
-                                        bool CanUseCondition1(Hashtable hashtable1)
-                                        {
-                                            if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
-                                            {
-                                                if (selectedPermanent.TopCard.Owner.GetBattleAreaDigimons().Contains(selectedPermanent))
-                                                {
-                                                    if (GManager.instance.turnStateMachine.gameContext.TurnPlayer == selectedPermanent.TopCard.Owner)
-                                                    {
-                                                        return true;
-                                                    }
-                                                }
-                                            }
-
-                                            return false;
-                                        }
-
-                                        bool CanActivateCondition1(Hashtable hashtable1)
-                                        {
-                                            if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
-                                            {
-                                                if (!permanent.TopCard.CanNotBeAffected(activateClass))
-                                                {
-                                                    if (permanent.CanAttack(activateClass1))
-                                                    {
-                                                        return true;
-                                                    }
-                                                }
-                                            }
-
-                                            return false;
-                                        }
-
-                                        IEnumerator ActivateCoroutine1(Hashtable _hashtable1)
-                                        {
-                                            if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
-                                            {
-                                                if (permanent.CanAttack(activateClass1))
-                                                {
-                                                    SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
-
-                                                    selectAttackEffect.SetUp(
-                                                        attacker: selectedPermanent,
-                                                        canAttackPlayerCondition: () => true,
-                                                        defenderCondition: (permanent) => true,
-                                                        cardEffect: activateClass1);
-
-                                                    selectAttackEffect.SetCanNotSelectNotAttack();
-
-                                                    yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
+                     bool trashed = false;
+
+                     List<CardSource> selectedCards = new List<CardSource>();
+
+                     SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
+
+                     selectCardEffect.SetUp(
+                                 canTargetCondition: CanSelectCardCondition,
+                                 canTargetCondition_ByPreSelecetedList: null,
+                                 canEndSelectCondition: null,
+                                 canNoSelect: () => true,
+                                 selectCardCoroutine: SelectCardCoroutine,
+                                 afterSelectCardCoroutine: null,
+                                 message: "Select 1 Option card to discard.",
+                                 maxCount: 1,
+                                 canEndNotMax: false,
+                                 isShowOpponent: true,
+                                 mode: SelectCardEffect.Mode.Custom,
+                                 root: SelectCardEffect.Root.Custom,
+                                 customRootCardList: card.PermanentOfThisCard().DigivolutionCards,
+                                 canLookReverseCard: true,
+                                 selectPlayer: card.Owner,
+                                 cardEffect: null);
+
+                     selectCardEffect.SetUpCustomMessage("Select 1 Option card to discard.", "The opponent is selecting 1 Option card to discard.");
+
+                     yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
+
+                     IEnumerator SelectCardCoroutine(CardSource cardSource)
+                     {
+                         selectedCards.Add(cardSource);
+
+                         yield return null;
+                     }
+
+                     if (selectedCards.Count >= 1)
+                     {
+                         yield return ContinuousController.instance.StartCoroutine(new ITrashDigivolutionCards(card.PermanentOfThisCard(), selectedCards, activateClass).TrashDigivolutionCards());
+
+                         trashed = true;
+                     }
+
+                     if (trashed)
+                     {
+                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
+                         {
+                             int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
+
+                             SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
+
+                             selectPermanentEffect.SetUp(
+                                 selectPlayer: card.Owner,
+                                 canTargetCondition: CanSelectPermanentCondition,
+                                 canTargetCondition_ByPreSelecetedList: null,
+                                 canEndSelectCondition: null,
+                                 maxCount: maxCount,
+                                 canNoSelect: false,
+                                 canEndNotMax: false,
+                                 selectPermanentCoroutine: SelectPermanentCoroutine,
+                                 afterSelectPermanentCoroutine: null,
+                                 mode: SelectPermanentEffect.Mode.Custom,
+                                 cardEffect: activateClass);
+
+                             selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon that will get Security Attack +1.", "The opponent is selecting 1 Digimon that will get Security Attack +1.");
+
+                             yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
+
+                             IEnumerator SelectPermanentCoroutine(Permanent permanent)
+                             {
+                                 yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonSAttack(targetPermanent: permanent, changeValue: 1, effectDuration: EffectDuration.UntilEachTurnEnd, activateClass: activateClass));
+
+                                 Permanent selectedPermanent = permanent;
+
+                                 if (selectedPermanent != null)
+                                 {
+                                     ActivateClass activateClass1 = new ActivateClass();
+                                     activateClass1.SetUpICardEffect("Attack with this Digimon", CanUseCondition1, selectedPermanent.TopCard);
+                                     activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
+                                     activateClass1.SetEffectSourcePermanent(selectedPermanent);
+
+                                     if (!permanent.TopCard.CanNotBeAffected(activateClass))
+                                     {
+                                         yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(selectedPermanent));
+                                     }
+
+                                     string EffectDiscription1()
+                                     {
+                                         return "[Start of Your Main Phase] Attack with this Digimon.";
+                                     }
+
+                                     bool CanUseCondition1(Hashtable hashtable1)
+                                     {
+                                         if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                         {
+                                             if (selectedPermanent.TopCard.Owner.GetBattleAreaDigimons().Contains(selectedPermanent))
+                                             {
+                                                 if (GManager.instance.turnStateMachine.gameContext.TurnPlayer == selectedPermanent.TopCard.Owner)
+                                                 {
+                                                     return true;
+                                                 }
+                                             }
+                                         }
+
+                                         return false;
+                                     }
+
+                                     bool CanActivateCondition1(Hashtable hashtable1)
+                                     {
+                                         if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                         {
+                                             if (!permanent.TopCard.CanNotBeAffected(activateClass))
+                                             {
+                                                 if (permanent.CanAttack(activateClass1))
+                                                 {
+                                                     return true;
+                                                 }
+                                             }
+                                         }
+
+                                         return false;
+                                     }
+
+                                     IEnumerator ActivateCoroutine1(Hashtable _hashtable1)
+                                     {
+                                         if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                         {
+                                             if (permanent.CanAttack(activateClass1))
+                                             {
+                                                 SelectAttackEffect selectAttackEffect = GManager.instance.GetComponent<SelectAttackEffect>();
+
+                                                 selectAttackEffect.SetUp(
+                                                     attacker: selectedPermanent,
+                                                     canAttackPlayerCondition: () => true,
+                                                     defenderCondition: (permanent) => true,
+                                                     cardEffect: activateClass1);
+
+                                                 selectAttackEffect.SetCanNotSelectNotAttack();
+
+                                                 yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
+                                             }
+                                         }
+                                     }
+                                 }
+                             }
+                         }
+                     }                    
                 }
             }
             #endregion

Assets/CardEffect/EX7/Red/ToyAgumon_EX7_008.cs

@@ -67,7 +67,7 @@ namespace DCGO.CardEffects.EX7
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                         if (card.Owner.LibraryCards.Count >= 1)
                         {
@@ -81,7 +81,7 @@ namespace DCGO.CardEffects.EX7
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 {
                     yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.SimplifiedRevealDeckTopCardsAndSelect(
-                        revealCount: 4,
+                        revealCount: 3,
                         simplifiedSelectCardConditions:
                         new SimplifiedSelectCardConditionClass[]
                         {

Assets/CardEffect/EX7/Red/Volcanicdramon_EX7_014.cs

@@ -11,7 +11,7 @@ namespace DCGO.CardEffects.EX7
             List<ICardEffect> cardEffects = new List<ICardEffect>();
 
             #region On Play
-            if (timing == EffectTiming.None)
+            if (timing == EffectTiming.OnEnterFieldAnyone)
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect(card.BaseENGCardNameFromEntity, CanUseCondition, card);
@@ -30,7 +30,7 @@ namespace DCGO.CardEffects.EX7
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {
@@ -93,7 +93,7 @@ namespace DCGO.CardEffects.EX7
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {
@@ -151,12 +151,20 @@ namespace DCGO.CardEffects.EX7
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanTriggerWhenDigivolving(hashtable, card);
+                    if(CardEffectCommons.IsExistOnBattleAreaDigimon(card))
+                    {
+                        if(CardEffectCommons.CanTriggerWhenDigivolving(hashtable, card))
+                        {
+                            return true;
+                        }
+                    }
+
+                    return false;
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                         return true;
                     }
@@ -216,6 +224,7 @@ namespace DCGO.CardEffects.EX7
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Play 1 Digimon card with the [Machine Dragon]/[Sky Dragon] trait", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, true, EffectDescription());
+                activateClass.SetHashString("PlayDigimon_EX7_014");
                 cardEffects.Add(activateClass);
 
                 string EffectDescription()
@@ -235,7 +244,7 @@ namespace DCGO.CardEffects.EX7
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnBattleArea(card) && CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardToPlayFromTrash);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) && CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardToPlayFromTrash);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

Assets/CardEffect/EX7/Red/Vorvomon_EX7_007.cs

@@ -34,7 +34,7 @@ namespace DCGO.CardEffects.EX7
 
                 bool CanSelectCardCondition1(CardSource cardSource)
                 {
-                    if (cardSource.CardNames.Contains("Hina Kurihara") || cardSource.CardNames.Contains("HinaKurihara"))
+                    if (cardSource.EqualsCardName("Hina Kurihara"))
                     {
                         return true;
                     }
@@ -49,7 +49,7 @@ namespace DCGO.CardEffects.EX7
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                         if (card.Owner.LibraryCards.Count >= 1)
                         {