Massive 1.8.5.6 card updates

Assets/CardBaseEntity/EX4/Blue/Digimon/EX4_016.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f7d7a7016ab64ba5a2d23e990a3c6d64ff54451b82d78570f6213f5afda0fe24
-size 2338
+oid sha256:2b476133186d0f25ac282a86c9c88dd5e4af8986cc5cb0ef065bf8208b1c8695
+size 2391

Assets/CardEffect/BT16/Black/BT16_062.cs

@@ -153,7 +153,7 @@ namespace DCGO.CardEffects.BT16
 
                 string EffectDiscription()
                 {
-                    return "[When Digivolve] <De-Digivolve 1> 1 of your opponent's Digimon with as much or less DP as this Digimon. Then, delete 1 Digimon with a play cost of 3 or less.";
+                    return "[When Digivolving] <De-Digivolve 1> 1 of your opponent's Digimon with as much or less DP as this Digimon. Then, delete 1 Digimon with a play cost of 3 or less.";
                 }
 
                 bool CanSelectDedigivolvePermanentCondition(Permanent permanent)

Assets/CardEffect/BT16/Purple/BT16_074.cs

@@ -219,7 +219,7 @@ namespace DCGO.CardEffects.BT16
                                                     {
                                                         if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass1))
                                                         {
-                                                            return true;
+                                                            return selectedPermanent.IsDigimon;
                                                         }
                                                     }
                                                 }

Assets/CardEffect/BT17/Blue/BT17_027.cs

@@ -560,6 +560,7 @@ namespace DCGO.CardEffects.BT17
                 activateClass.SetUpICardEffect("Unsuspend", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, false, EffectDescription());
                 activateClass.SetIsInheritedEffect(true);
+                activateClass.SetHashString("Unsuspend_BT17-027");
                 cardEffects.Add(activateClass);
 
                 string EffectDescription()

Assets/CardEffect/BT17/White/BT17_077.cs

@@ -61,15 +61,13 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanTriggerOnAttack(hashtable, card))
-                        return CardEffectCommons.HasMatchConditionPermanent(IsOpponentsDigimon);
-
-                    return false;
+                    return CardEffectCommons.CanTriggerOnAttack(hashtable, card);
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
+                           CardEffectCommons.HasMatchConditionPermanent(IsOpponentsDigimon);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

Assets/CardEffect/BT20/Black/BT20_095.cs

@@ -73,7 +73,7 @@ namespace DCGO.CardEffects.BT20
                 string EffectDescription()
                 {
                     return
-                        "[All Turns] When any of your [Chronicle] trait Digimon are deleted, <Delay>.\n・By moving your level 3 or higher [Chronicle] trait Digimon from the breeding area to the battle area, it may digivolve into a [Chronicle] trait Digimon card in the hand or trash without paying the cost.";
+                        "[All Turns] When any of your [Chronicle] trait Digimon are deleted, <Delay>.\n・By moving your level 3 or higher Digimon from the breeding area to the battle area, it may digivolve into a [Chronicle] trait Digimon card in the hand or trash without paying the cost.";
                 }
 
                 bool PermanentCondition(Permanent permanent)
@@ -85,7 +85,6 @@ namespace DCGO.CardEffects.BT20
                 bool BreedingAreaPermanentCondition(Permanent permanent)
                 {
                     return permanent.IsDigimon &&
-                           permanent.TopCard.ContainsTraits("Chronicle") &&
                            permanent.TopCard.HasLevel && permanent.Level >= 3 &&
                            permanent.CanMove;
                 }

Assets/CardEffect/BT20/Purple/BT20_075.cs

@@ -173,7 +173,7 @@ namespace DCGO.CardEffects.BT20
 
                 string EffectDiscription()
                 {
-                    return "[On Play] Trash 2 cards in your hand. Then, for the turn, 1 of your Digimon gains <Raid> and <Piercing> and +4000 DP.";
+                    return "[When Digivolving] Trash 2 cards in your hand. Then, for the turn, 1 of your Digimon gains <Raid> and <Piercing> and +4000 DP.";
                 }
 
                 bool CanSelectPermanentCondition(Permanent permanent)

Assets/CardEffect/BT21/Yellow/BT21_044.cs

@@ -116,7 +116,7 @@ namespace DCGO.CardEffects.BT21
                             canTargetCondition_ByPreSelecetedList: null,
                             canEndSelectCondition: null,
                             maxCount: 1,
-                            canNoSelect: false,
+                            canNoSelect: true,
                             canEndNotMax: false,
                             selectPermanentCoroutine: SelectPermanentCoroutine2,
                             afterSelectPermanentCoroutine: null,
@@ -245,7 +245,7 @@ namespace DCGO.CardEffects.BT21
                             canTargetCondition_ByPreSelecetedList: null,
                             canEndSelectCondition: null,
                             maxCount: 1,
-                            canNoSelect: false,
+                            canNoSelect: true,
                             canEndNotMax: false,
                             selectPermanentCoroutine: SelectPermanentCoroutine2,
                             afterSelectPermanentCoroutine: null,

Assets/CardEffect/EX2/Red/EX2_056.cs

@@ -154,11 +154,70 @@ namespace DCGO.CardEffects.EX2
                         {
                             foreach (Permanent permanent in card.Owner.GetBattleAreaPermanents().Filter(PermanentCondition))
                             {
-                                yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainBlitz(
-                                    targetPermanent: permanent,
-                                    effectDuration: EffectDuration.UntilEachTurnEnd,
-                                    activateClass: activateClass,
-                                    isWhenDigivolving: true));
+
+                                ActivateClass activateClass1 = new ActivateClass();
+                                activateClass1.SetUpICardEffect("Blitz", CanUseCondition1, permanent.TopCard);
+                                activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
+                                activateClass1.SetEffectSourcePermanent(permanent);
+                                permanent.UntilEachTurnEndEffects.Add(GetCardEffect);
+
+                                yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(permanent));
+
+                                string EffectDiscription1()
+                                {
+                                    return "[When Digivolving] <Blitz> (This Digimon can attack when your opponent has 1 or more memory.)";
+                                }
+
+                                bool CanUseCondition1(Hashtable hashtable1)
+                                {
+                                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(permanent.TopCard))
+                                    {
+                                        if (CardEffectCommons.CanTriggerWhenDigivolving(hashtable1, card))
+                                        {
+                                            return true;
+                                        }
+                                    }
+
+                                    return false;
+                                }
+
+                                bool CanActivateCondition1(Hashtable hashtable1)
+                                {
+                                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(permanent.TopCard))
+                                    {
+                                        if (CardEffectCommons.CanActivateBlitz(permanent.TopCard, activateClass1))
+                                        {
+                                            return true;
+                                        }
+                                    }
+
+                                    return false;
+                                }
+
+                                IEnumerator ActivateCoroutine1(Hashtable _hashtable1)
+                                {
+                                    if (permanent.TopCard != null)
+                                    {
+                                        if (permanent.TopCard.Owner.GetBattleAreaDigimons().Contains(permanent))
+                                        {
+                                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainBlitz(
+                                                targetPermanent: permanent,
+                                                effectDuration: EffectDuration.UntilEachTurnEnd,
+                                                activateClass: activateClass1,
+                                                isWhenDigivolving: true));
+                                        }
+                                    }
+                                }
+
+                                ICardEffect GetCardEffect(EffectTiming _timing)
+                                {
+                                    if (_timing == EffectTiming.OnEnterFieldAnyone)
+                                    {
+                                        return activateClass1;
+                                    }
+
+                                    return null;
+                                }
                             }
                         }
                     }

Assets/CardEffect/EX3/Blue/EX3_024.cs

@@ -269,7 +269,7 @@ namespace DCGO.CardEffects.EX3
                                 return true;
                             }
 
-                            if (permanent.TopCard.CardNames.Contains("Examon"))
+                            if (permanent.TopCard.ContainsCardName("Examon"))
                             {
                                 return true;
                             }

Assets/CardEffect/EX6/Black/EX6_043.cs

@@ -179,11 +179,16 @@ namespace DCGO.CardEffects.EX6
 
                         if (selectedEffect != null)
                         {
-                            Hashtable effectHashtable = CardEffectCommons.WhenDigivolvingCheckHashtableOfCard(selectedEffect.EffectSourceCard);
+                            if (!selectedEffect.IsDisabled)
+                            {
+                                Hashtable effectHashtable =
+                                CardEffectCommons.WhenDigivolvingCheckHashtableOfCard(selectedEffect.EffectSourceCard);
 
-                            yield return ContinuousController.instance.StartCoroutine(
-                                ((ActivateICardEffect)selectedEffect).Activate_Optional_Effect_Execute(effectHashtable));
+                                selectedEffect.SetIsDigimonEffect(true);
 
+                                yield return ContinuousController.instance.StartCoroutine(
+                                    ((ActivateICardEffect)selectedEffect).Activate_Optional_Effect_Execute(effectHashtable));
+                            }
                         }
                     }
                 }

Assets/CardEffect/EX6/Yellow/EX6_031.cs

@@ -355,14 +355,13 @@ namespace DCGO.CardEffects.EX6
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
                         Permanent cardPermanent = card.PermanentOfThisCard();
-                        
+                        List<CardSource> selectedCards = new List<CardSource>();
+
                         if (cardPermanent.DigivolutionCards.Count(CanSelectDigimonSanzomonCardCondition) >= 1)
                         {
                             int maxCount = Math.Min(1,
                                 cardPermanent.DigivolutionCards.Count(CanSelectDigimonSanzomonCardCondition));
                             
-                            List<CardSource> selectedCards = new List<CardSource>();
-                            
                             SelectCardEffect selectCardEffect =
                                 GManager.instance.GetComponent<SelectCardEffect>();
                             
@@ -397,16 +396,6 @@ namespace DCGO.CardEffects.EX6
                                 
                                 yield return null;
                             }
-                            
-                            // Play the selected Digivolution card
-                            yield return ContinuousController.instance.StartCoroutine(
-                                CardEffectCommons.PlayPermanentCards(
-                                    cardSources: selectedCards,
-                                    activateClass: activateClass,
-                                    payCost: false,
-                                    isTapped: false,
-                                    root: SelectCardEffect.Root.DigivolutionCards,
-                                    activateETB: true));
                         }
                         
                         if (cardPermanent.DigivolutionCards.Count(CanSelectDigimonJourneyCardCondition) >= 1)
@@ -414,8 +403,6 @@ namespace DCGO.CardEffects.EX6
                             int maxCount = Math.Min(1,
                                 cardPermanent.DigivolutionCards.Count(CanSelectDigimonJourneyCardCondition));
                             
-                            List<CardSource> selectedCards = new List<CardSource>();
-                            
                             SelectCardEffect selectCardEffect =
                                 GManager.instance.GetComponent<SelectCardEffect>();
                             
@@ -450,17 +437,17 @@ namespace DCGO.CardEffects.EX6
                                 
                                 yield return null;
                             }
-                            
-                            // Play the selected Digivolution card
-                            yield return ContinuousController.instance.StartCoroutine(
-                                CardEffectCommons.PlayPermanentCards(
-                                    cardSources: selectedCards,
-                                    activateClass: activateClass,
-                                    payCost: false,
-                                    isTapped: false,
-                                    root: SelectCardEffect.Root.DigivolutionCards,
-                                    activateETB: true));
                         }
+
+                        // Play the selected Digivolution card
+                        yield return ContinuousController.instance.StartCoroutine(
+                            CardEffectCommons.PlayPermanentCards(
+                                cardSources: selectedCards,
+                                activateClass: activateClass,
+                                payCost: false,
+                                isTapped: false,
+                                root: SelectCardEffect.Root.DigivolutionCards,
+                                activateETB: true));
                     }
                 }
             }

Assets/CardEffect/EX7/Purple/EX7_006.cs

@@ -33,14 +33,11 @@ namespace DCGO.CardEffects.EX7
                 {
                     if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
-                        if (card.Owner.LibraryCards.Count >= 1)
+                        if (card.Owner.HandCards.Count <= 4)
                         {
-                            if (card.Owner.HandCards.Count <= 4)
+                            if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition))
                             {
-                                if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition)) 
-                                {
-                                    return true;
-                                }
+                                return true;
                             }
                         }
                     }

Assets/CardEffect/EX8/Black/EX8_053.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace DCGO.CardEffects.EX8
 {
@@ -9,8 +10,6 @@ namespace DCGO.CardEffects.EX8
         {
             List<ICardEffect> cardEffects = new List<ICardEffect>();
 
-            bool opponentHas13kDP = false;
-
             #region Blocker
             if (timing == EffectTiming.None)
             {
@@ -22,46 +21,27 @@ namespace DCGO.CardEffects.EX8
             #endregion
 
             #region All Turns
-            if(timing == EffectTiming.None)
-            {
-                bool Condition()
-                {
-                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
-                           CardEffectCommons.HasMatchConditionOpponentsPermanent(card, permanent => permanent.IsDigimon && permanent.DP >= 13000);
-                }
-
-                if (Condition() != opponentHas13kDP)
-                    opponentHas13kDP = Condition();
-            }
 
-            if (timing == EffectTiming.None)
+            if (timing == EffectTiming.RulesTiming || timing == EffectTiming.AfterEffectsActivate)
             {
-                string EffectDiscription()
+                if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                 {
-                    return "[All Turns] While your opponent has a Digimon with 13000 DP or more, this Digimon gets +5000 DP.";
+                    Permanent thisPermanent = card.PermanentOfThisCard();
+
+                    if (Condition())
+                        thisPermanent.AddBoost(new Permanent.DPBoost("EX8_053", 5000, Condition));
+                    else
+                        thisPermanent.RemoveBoost("EX8_053");
                 }
 
                 bool Condition()
                 {
                     return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
-                           opponentHas13kDP;
-                }
-
-                bool PermanentCondition(Permanent permanent)
-                {
-                    return CardEffectCommons.IsExistOnBattleArea(card) &&
-                           card == card.PermanentOfThisCard().TopCard &&
-                           permanent == card.PermanentOfThisCard();
+                           card.PermanentOfThisCard().TopCard == card &&
+                           CardEffectCommons.HasMatchConditionOpponentsPermanent(card, permanent => permanent.IsDigimon && permanent.DP >= 13000);
                 }
-
-                cardEffects.Add(CardEffectFactory.ChangeDPStaticEffect(
-                permanentCondition: PermanentCondition,
-                changeValue: 5000,
-                isInheritedEffect: false,
-                card: card,
-                condition: Condition,
-                effectName: EffectDiscription));
             }
+
             #endregion
 
             #region On Deletion

Assets/CardEffect/EX8/Yellow/EX8_031.cs

@@ -44,7 +44,7 @@ namespace DCGO.CardEffects.EX8
                 string EffectDescription()
                 {
                     return
-                        "[When Digivolving] Return 1 Option card with [Plug-In] in its name from your trash to your hand.";
+                        "[On Play] Return 1 Option card with [Plug-In] in its name from your trash to your hand.";
                 }
 
                 bool CanSelectCardCondition(CardSource cardSource)

Assets/CardEffect/LM/Yellow/LM_020.cs

@@ -213,6 +213,7 @@ namespace DCGO.CardEffects.LM
                             new SelectionElement<int>(message: $"Digimon", value : 0, spriteIndex: 0),
                             new SelectionElement<int>(message: $"Tamer", value : 1, spriteIndex: 0),
                             new SelectionElement<int>(message: $"Option", value : 2, spriteIndex: 0),
+                            new SelectionElement<int>(message: $"Digi-Egg", value: 3, spriteIndex: 0)
                         };
 
                     string selectPlayerMessage = "Choose a card category you will use?";
@@ -269,9 +270,9 @@ namespace DCGO.CardEffects.LM
 
                         bool CardCondition(CardSource cardSource)
                             {
-                                if (cardSource == card)
+                                if (cardSource.PermanentOfThisCard() == selectedPermanent)
                                 {
-                                    if (CardEffectCommons.IsExistOnBattleArea(card))
+                                    if (CardEffectCommons.IsExistOnBattleArea(cardSource))
                                     {
                                         return true;
                                     }
@@ -302,7 +303,13 @@ namespace DCGO.CardEffects.LM
                                             return true;
                                         }
                                         break;
-                                    }
+                                    case CardKind.DigiEgg:
+                                        if (cardEffect.IsDigimonEffect || cardEffect.EffectSourceCard.IsDigiEgg)
+                                        {
+                                            return true;
+                                        }
+                                        break;
+                                }
                                 return false;
                             }
                             yield return null;

Assets/CardEffect/LM/Yellow/LM_023.cs

@@ -212,7 +212,7 @@ namespace DCGO.CardEffects.LM
                 bool CanUseCondition(Hashtable hashtable)
                 {
                     return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
-                           CardEffectCommons.CanTriggerWhenOwnerUseOption(hashtable, null, null, card);
+                           CardEffectCommons.CanTriggerWhenUseOption(hashtable, null, null, card);
                 }
 
                 bool CanSelectPermanentCondition(Permanent permanent)

Assets/CardEffect/P/Blue/P_168.cs

@@ -76,13 +76,16 @@ namespace DCGO.CardEffects.P
                 {
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
-                        if (CardEffectCommons.CanTriggerOnAddDigivolutionCard(
+                        if (CardEffectCommons.IsOwnerTurn(card))
+                        {
+                            if (CardEffectCommons.CanTriggerOnAddDigivolutionCard(
                                 hashtable: hashtable,
                                 permanentCondition: IsValidPermanentToDigivolveCondition,
                                 cardEffectCondition: cardEffect => cardEffect.EffectSourceCard != null,
                                 cardCondition: null))
-                        {
-                            return true;
+                            {
+                                return true;
+                            }
                         }
                     }
 

Assets/CardEffect/P/Blue/P_171.cs

@@ -408,19 +408,21 @@ namespace DCGO.CardEffects.P
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnBattleArea(card) &&
-                           CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition);
+                    return CardEffectCommons.IsExistOnBattleArea(card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 {
-                    foreach (Permanent selectedPermanent in card.Owner.Enemy.GetBattleAreaDigimons())
+                    if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                     {
-                        if (CanSelectPermanentCondition(selectedPermanent))
+                        foreach (Permanent selectedPermanent in card.Owner.Enemy.GetBattleAreaDigimons())
                         {
-                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.TrashDigivolutionCardsFromTopOrBottom(targetPermanent: selectedPermanent, trashCount: 2, isFromTop: true, activateClass: activateClass));
+                            if (CanSelectPermanentCondition(selectedPermanent))
+                            {
+                                yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.TrashDigivolutionCardsFromTopOrBottom(targetPermanent: selectedPermanent, trashCount: 2, isFromTop: true, activateClass: activateClass));
+                            }
                         }
-                    }
+                    }                    
 
                     if (CardEffectCommons.HasMatchConditionPermanent(CanDigionWithoutSourcesCondition))
                     {
@@ -496,17 +498,19 @@ namespace DCGO.CardEffects.P
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnBattleArea(card) &&
-                           CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition);
+                    return CardEffectCommons.IsExistOnBattleArea(card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 {
-                    foreach (Permanent selectedPermanent in card.Owner.Enemy.GetBattleAreaDigimons())
+                    if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                     {
-                        if (CanSelectPermanentCondition(selectedPermanent))
+                        foreach (Permanent selectedPermanent in card.Owner.Enemy.GetBattleAreaDigimons())
                         {
-                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.TrashDigivolutionCardsFromTopOrBottom(targetPermanent: selectedPermanent, trashCount: 2, isFromTop: true, activateClass: activateClass));
+                            if (CanSelectPermanentCondition(selectedPermanent))
+                            {
+                                yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.TrashDigivolutionCardsFromTopOrBottom(targetPermanent: selectedPermanent, trashCount: 2, isFromTop: true, activateClass: activateClass));
+                            }
                         }
                     }
 

Assets/CardEffect/P/Green/P_143.cs

@@ -50,7 +50,8 @@ namespace DCGO.CardEffects.P
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
-                    yield return ContinuousController.instance.StartCoroutine(CardObjectController.MovePermanent(card.PermanentOfThisCard().PermanentFrame,true));
+                    if(GManager.instance.turnStateMachine.gameContext.TurnPlayer.CanMove)
+                        yield return ContinuousController.instance.StartCoroutine(CardObjectController.MovePermanent(card.PermanentOfThisCard().PermanentFrame,true));
                 }
             }
             #endregion

Assets/CardEffect/P/Purple/P_187.cs

@@ -198,13 +198,18 @@ namespace DCGO.CardEffects.P
 
                                 if (selectedPermanent.TopCard.Owner.CanAddSecurity(activateClass))
                                 {
+                                    CardSource topCard = selectedPermanent.TopCard;
+
                                     yield return ContinuousController.instance.StartCoroutine(new IPutSecurityPermanent(selectedPermanent, CardEffectCommons.CardEffectHashtable(activateClass), toTop: position).PutSecurity());
 
-                                    yield return ContinuousController.instance.StartCoroutine(new IDestroySecurity(
+                                    if (topCard.Owner.SecurityCards.Contains(topCard))
+                                    {
+                                        yield return ContinuousController.instance.StartCoroutine(new IDestroySecurity(
                                         player: card.Owner.Enemy,
                                         destroySecurityCount: 1,
                                         cardEffect: activateClass,
                                         fromTop: true).DestroySecurity());
+                                    }
                                 }
                             }
                         }

Assets/CardEffect/P/Red/P_170.cs

@@ -49,10 +49,7 @@ namespace DCGO.CardEffects.P
                 {
                     if (cardSource == card)
                     {
-                        if (CardEffectCommons.IsExistOnHand(cardSource))
-                        {
-                            return true;
-                        }
+                        return true;
                     }
 
                     return false;
@@ -78,12 +75,9 @@ namespace DCGO.CardEffects.P
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnHand(card))
+                    if (CardEffectCommons.MatchConditionOwnersCardCountInTrash(card, CanSelectThreeMusketeersCondition) >= 3)
                     {
-                        if (CardEffectCommons.MatchConditionOwnersCardCountInTrash(card, CanSelectThreeMusketeersCondition) >= 3)
-                        {
-                            return true;
-                        }
+                        return true;
                     }
 
                     return false;
@@ -220,16 +214,13 @@ namespace DCGO.CardEffects.P
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (card.Owner.HandCards.Contains(card))
-                    {
-                        ICardEffect activateClass = card.EffectList(EffectTiming.BeforePayCost).Find(cardEffect => cardEffect.EffectName == "Return 3 [Three Musketeers] to get Play Cost -6");
+                    ICardEffect activateClass = card.EffectList(EffectTiming.BeforePayCost).Find(cardEffect => cardEffect.EffectName == "Return 3 [Three Musketeers] to get Play Cost -6");
 
-                        if (activateClass != null)
+                    if (activateClass != null)
+                    {
+                        if (CardEffectCommons.MatchConditionOwnersCardCountInTrash(card, CanSelectThreeMusketeersCondition) >= 3)
                         {
-                            if (CardEffectCommons.MatchConditionOwnersCardCountInTrash(card, CanSelectThreeMusketeersCondition) >= 3)
-                            {
-                                return true;
-                            }
+                            return true;
                         }
                     }
 

Assets/CardEffect/ST14/Purple/ST14_01.cs

@@ -31,17 +31,12 @@ public class ST14_01 : CEntity_Effect
             {
                 if (CardEffectCommons.IsExistOnBattleArea(card))
                 {
-                    if (card.PermanentOfThisCard().TopCard.CardTraits.Contains("Wizard"))
+                    if (card.PermanentOfThisCard().TopCard.EqualsTraits("Wizard"))
                     {
                         return true;
                     }
 
-                    if (card.PermanentOfThisCard().TopCard.CardTraits.Contains("Demon Lord"))
-                    {
-                        return true;
-                    }
-
-                    if (card.PermanentOfThisCard().TopCard.CardTraits.Contains("DemonLord"))
+                    if (card.PermanentOfThisCard().TopCard.EqualsTraits("Demon Lord"))
                     {
                         return true;
                     }

Assets/CardEffect/ST15/Black/ST15_08.cs

@@ -41,7 +41,7 @@ public class ST15_08 : CEntity_Effect
         if (timing == EffectTiming.SecuritySkill)
         {
             ActivateClass activateClass = new ActivateClass();
-            activateClass.SetUpICardEffect("Play 1 [Agumon] or 1 Tamer card with [Tai Kamiya] from hand or tarsh", CanUseCondition, card);
+            activateClass.SetUpICardEffect("Play 1 [Agumon] or 1 Tamer card with [Tai Kamiya] from hand or trash", CanUseCondition, card);
             activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
             activateClass.SetIsSecurityEffect(true);
             cardEffects.Add(activateClass);