Merge pull request #19 from DCGO2/Release-Updates

Release updates

Assets/CardBaseEntity/BT10/Red/Digimon/シャウトモンX5-BT10-013.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc5e290ad826a12e9e9d0854698c82a423c967c7e0e1adf911a90cc2422e5e4a
-size 3134
+oid sha256:66953d0ffe569baf5dd1ccaee2f3c7729d9ecb0caccf96f2290b2eeeb288b24f
+size 2862

Assets/CardEffect/BT1/Red/Metalgreymon_BT1_021.cs

@@ -21,7 +21,7 @@ public class Metalgreymon_BT1_021 : CEntity_Effect
 
             string EffectDiscription()
             {
-                return "[When Attacking] Gain 3 memory. At end of turn�Close 3 memory.";
+                return "[When Attacking] Gain 3 memory. At end of turn� lose 3 memory.";
             }
 
             bool CanUseCondition(Hashtable hashtable)

Assets/CardEffect/BT11/Black/Analogman_BT11_092.cs

@@ -131,12 +131,9 @@ public class Analogman_BT11_092 : CEntity_Effect
                 {
                     if (permanent.TopCard.CardTraits.Contains("Machine"))
                     {
-                        if (permanent.TopCard.Level == 6)
+                        if (permanent.TopCard.HasLevel && permanent.TopCard.Level == 6)
                         {
-                            if (permanent.TopCard.HasLevel)
-                            {
-                                return true;
-                            }
+                            return true;
                         }
                     }
                 }
@@ -146,10 +143,6 @@ public class Analogman_BT11_092 : CEntity_Effect
 
             bool PermanentCondition(Permanent permanent)
             {
-                if (permanent.IsDigimon || permanent.IsTamer)
-                {
-                    return false;
-                }
                 return CardEffectCommons.IsOpponentPermanent(permanent, card);
             }
 

Assets/CardEffect/BT11/Black/HadesForce_BT11_107.cs

@@ -294,7 +294,8 @@ public class HadesForce_BT11_107 : CEntity_Effect
 
             bool CanSelectPermanentCondition(Permanent permanent)
             {
-                return CardEffectCommons.IsMaxCost(permanent, card.Owner.Enemy, true);
+                    return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card) && 
+                           CardEffectCommons.IsMaxCost(permanent, card.Owner.Enemy, true);
             }
 
             bool CanUseCondition(Hashtable hashtable)

Assets/CardEffect/BT12/Blue/ImperialdramonFighterMode_BT12_031.cs

@@ -58,7 +58,8 @@ public class ImperialdramonFighterMode_BT12_031 : CEntity_Effect
                 {
                     if (cardSource.Owner == card.Owner)
                     {
-                        if (cardSource.CardNames.Contains("Imperialdramon: Dragon Mode") || cardSource.CardNames.Contains("Imperialdramon:DragonMode"))
+                        if (cardSource.CardNames.Contains("Imperialdramon: Dragon Mode") || cardSource.CardNames.Contains("Imperialdramon:DragonMode") || 
+                            cardSource.CardNames.Contains("Imperialdramon Dragon Mode") || cardSource.CardNames.Contains("ImperialdramonDragonMode"))
                         {
                             return true;
                         }

Assets/CardEffect/BT12/Purple/BaalmonXAntibody_BT12_082.cs

@@ -145,7 +145,7 @@ public class BaalmonXAntibody_BT12_082 : CEntity_Effect
 
             bool CanActivateCondition(Hashtable hashtable)
             {
-                if (isExistOnField(card))
+                if (CardEffectCommons.IsExistOnBattleArea(card))
                 {
                     if (card.Owner.GetBattleAreaDigimons().Contains(card.PermanentOfThisCard()))
                     {
@@ -172,41 +172,38 @@ public class BaalmonXAntibody_BT12_082 : CEntity_Effect
 
             IEnumerator ActivateCoroutine(Hashtable _hashtable)
             {
-                if (isExistOnField(card))
+
+                if (card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) => cardSource.CardNames.Contains("Baalmon") || cardSource.CardNames.Contains("X Antibody") || cardSource.CardNames.Contains("XAntibody")) >= 1)
                 {
-                    if (card.Owner.GetBattleAreaDigimons().Contains(card.PermanentOfThisCard()))
+                    if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                     {
-                        if (card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) => cardSource.CardNames.Contains("Baalmon") || cardSource.CardNames.Contains("X Antibody") || cardSource.CardNames.Contains("XAntibody")) >= 1)
-                        {
-                            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: null,
-                                    afterSelectPermanentCoroutine: null,
-                                    mode: SelectPermanentEffect.Mode.Destroy,
-                                    cardEffect: activateClass);
-
-                                yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
-                            }
-                        }
-
-                        else
-                        {
-                            yield return ContinuousController.instance.StartCoroutine(new IAddTrashCardsFromLibraryTop(3, card.Owner, activateClass).AddTrashCardsFromLibraryTop());
-                        }
+                        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: null,
+                            afterSelectPermanentCoroutine: null,
+                            mode: SelectPermanentEffect.Mode.Destroy,
+                            cardEffect: activateClass);
+
+                        yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
                     }
                 }
+
+                else
+                {
+                    yield return ContinuousController.instance.StartCoroutine(new IAddTrashCardsFromLibraryTop(3, card.Owner, activateClass).AddTrashCardsFromLibraryTop());
+                }
+                    
+                
             }
         }
 

Assets/CardEffect/BT13/Purple/GizimonXT_BT13_086.cs

@@ -16,7 +16,7 @@ public class GizimonXT_BT13_086 : CEntity_Effect
         {
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Delete your 1 level 4 Digimon to get Play Cost -6", CanUseCondition, card);
-            activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
+            activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
             activateClass.SetHashString("PlayCost-6_BT13_086");
             cardEffects.Add(activateClass);
 

Assets/CardEffect/BT13/Yellow/Ponechessmon_BT13_035.cs

@@ -40,25 +40,20 @@ public class Ponechessmon_BT13_035 : CEntity_Effect
             {
                 if (cardSource != null)
                 {
-                    if (cardSource.CardNames.Contains("Chessmon"))
+                    if (cardSource.IsDigimon)
                     {
-                        if (cardSource.IsDigimon)
+                        if (cardSource.Level <= maxLevel())
                         {
-                            if (cardSource.Level <= maxLevel())
+                            if (cardSource.ContainsCardName("Chessmon"))
                             {
-                                if (cardSource.HasLevel)
+                                if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
                                 {
-                                    if (cardSource.Owner == card.Owner)
-                                    {
-                                        if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
-                                        {
-                                            return true;
-                                        }
-                                    }
+                                    return true;
                                 }
                             }
+                            
                         }
-                    }
+                    } 
                 }
 
                 return false;

Assets/CardEffect/BT15/Black/Megadramon_BT15_064.cs

@@ -44,7 +44,7 @@ public class Megadramon_BT15_064 : CEntity_Effect
 
             string EffectDiscription()
             {
-                return "[When Attacking][De-Digivolve] 1��n 1 of your opponent's Digimon (Trash up to 1 card from the top of one of your opponent's Digimon. If it has no digivolution cards, or becomes a level 3 Digimon, you can't trash any more cards).";
+                return "[When Attacking] [De-Digivolve] 1 of your opponent's Digimon (Trash up to 1 card from the top of one of your opponent's Digimon. If it has no digivolution cards, or becomes a level 3 Digimon, you can't trash any more cards).";
             }
 
             bool CanSelectPermanentCondition(Permanent permanent)
@@ -120,7 +120,7 @@ public class Megadramon_BT15_064 : CEntity_Effect
                 {
                     if (permanent.TopCard.GetCostItself <= 3)
                     {
-                        if (!permanent.TopCard.IsDigiEgg || !permanent.TopCard.IsOption)
+                        if (permanent.IsDigimon || permanent.IsTamer)
                         {
                             return true;
                         }

Assets/CardEffect/BT15/Black/WaruMonzaemon_BT15_065.cs

@@ -519,18 +519,6 @@ public class WaruMonzaemon_BT15_065 : CEntity_Effect
         #region Your Turn - When you have a [Monzaemon] or [Numemon] in play, this Digimon gains Security Atk +1.
         if (timing == EffectTiming.None)
         {
-            bool PermanentCondition(Permanent permanent)
-            {
-                if(permanent.IsDigimon)
-                {
-                    if (permanent.TopCard != card)
-                    {
-                        return permanent.TopCard.ContainsCardName("Monzaemon") || permanent.TopCard.ContainsCardName("Numemon");
-                    }
-                }
-
-                return false;
-            }
 
             bool Condition()
             {
@@ -538,7 +526,7 @@ public class WaruMonzaemon_BT15_065 : CEntity_Effect
                 {
                     if (CardEffectCommons.IsOwnerTurn(card))
                     {
-                        if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, PermanentCondition))
+                        if (card.PermanentOfThisCard().TopCard.ContainsCardName("Monzaemon") || card.PermanentOfThisCard().TopCard.ContainsCardName("Numemomn"))
                         {
                             return true;
                         }

Assets/CardEffect/BT15/Blue/Garurumon_BT15_024.cs

@@ -40,7 +40,7 @@ public class Garurumon_BT15_024 : CEntity_Effect
         {
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Draw 1 or Play 1 tamer", CanUseCondition, card);
-            activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
+            activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
             cardEffects.Add(activateClass);
 
             string EffectDiscription()
@@ -116,134 +116,155 @@ public class Garurumon_BT15_024 : CEntity_Effect
                     yield return ContinuousController.instance.StartCoroutine(new DrawClass(card.Owner, 1, activateClass).Draw());
                 }
 
+                
+
                 if (!CardEffectCommons.HasMatchConditionOwnersPermanent(card, PermanentCondition))
                 {
-                    #region reduce play cost
-                    ChangeCostClass changeCostClass = new ChangeCostClass();
-                    changeCostClass.SetUpICardEffect($"Play Cost -3", CanUseCondition1, card);
-                    changeCostClass.SetUpChangeCostClass(changeCostFunc: ChangeCost, cardSourceCondition: CardSourceCondition, rootCondition: RootCondition, isUpDown: isUpDown, isCheckAvailability: () => false, isChangePayingCost: () => true);
-                    Func<EffectTiming, ICardEffect> getCardEffect = GetCardEffect;
-                    card.Owner.UntilCalculateFixedCostEffect.Add(getCardEffect);
-
-                    ICardEffect GetCardEffect(EffectTiming _timing)
-                    {
-                        if (_timing == EffectTiming.None)
+
+                    List<SelectionElement<bool>> selectionElements = new List<SelectionElement<bool>>()
                         {
-                            return changeCostClass;
-                        }
+                            new SelectionElement<bool>(message: $"Yes", value : true, spriteIndex: 0),
+                            new SelectionElement<bool>(message: $"No", value : false, spriteIndex: 1),
+                        };
 
-                        return null;
-                    }
+                    string selectPlayerMessage = "Will you play 1 [Matt Ishida] from your hand?";
+                    string notSelectPlayerMessage = "The opponent is choosing whether or not to play a Tamer.";
 
-                    bool CanUseCondition1(Hashtable hashtable)
-                    {
-                        return true;
-                    }
+                    GManager.instance.userSelectionManager.SetBoolSelection(selectionElements: selectionElements, selectPlayer: card.Owner, selectPlayerMessage: selectPlayerMessage, notSelectPlayerMessage: notSelectPlayerMessage);
 
-                    int ChangeCost(CardSource cardSource, int Cost, SelectCardEffect.Root root, List<Permanent> targetPermanents)
+                    yield return ContinuousController.instance.StartCoroutine(GManager.instance.userSelectionManager.WaitForEndSelect());
+
+                    bool willPlayMatt = GManager.instance.userSelectionManager.SelectedBoolValue;
+
+                    if (willPlayMatt)
                     {
-                        if (CardSourceCondition(cardSource))
+                        #region reduce play cost
+                        ChangeCostClass changeCostClass = new ChangeCostClass();
+                        changeCostClass.SetUpICardEffect($"Play Cost -3", CanUseCondition1, card);
+                        changeCostClass.SetUpChangeCostClass(changeCostFunc: ChangeCost, cardSourceCondition: CardSourceCondition, rootCondition: RootCondition, isUpDown: isUpDown, isCheckAvailability: () => false, isChangePayingCost: () => true);
+                        Func<EffectTiming, ICardEffect> getCardEffect = GetCardEffect;
+                        card.Owner.UntilCalculateFixedCostEffect.Add(getCardEffect);
+
+                        ICardEffect GetCardEffect(EffectTiming _timing)
                         {
-                            if (RootCondition(root))
+                            if (_timing == EffectTiming.None)
                             {
-                                if (PermanentsCondition(targetPermanents))
-                                {
-                                    Cost -= 3;
-                                }
+                                return changeCostClass;
                             }
-                        }
 
-                        return Cost;
-                    }
+                            return null;
+                        }
 
-                    bool PermanentsCondition(List<Permanent> targetPermanents)
-                    {
-                        if (targetPermanents == null)
+                        bool CanUseCondition1(Hashtable hashtable)
                         {
                             return true;
                         }
 
-                        else
+                        int ChangeCost(CardSource cardSource, int Cost, SelectCardEffect.Root root, List<Permanent> targetPermanents)
                         {
-                            if (targetPermanents.Count((targetPermanent) => targetPermanent != null) == 0)
+                            if (CardSourceCondition(cardSource))
                             {
-                                return true;
+                                if (RootCondition(root))
+                                {
+                                    if (PermanentsCondition(targetPermanents))
+                                    {
+                                        Cost -= 3;
+                                    }
+                                }
                             }
-                        }
 
-                        return false;
-                    }
+                            return Cost;
+                        }
 
-                    bool CardSourceCondition(CardSource cardSource)
-                    {
-                        if (cardSource.IsTamer)
+                        bool PermanentsCondition(List<Permanent> targetPermanents)
                         {
-                            if (cardSource.ContainsCardName("Matt Ishida"))
+                            if (targetPermanents == null)
                             {
                                 return true;
                             }
+
+                            else
+                            {
+                                if (targetPermanents.Count((targetPermanent) => targetPermanent != null) == 0)
+                                {
+                                    return true;
+                                }
+                            }
+
+                            return false;
                         }
 
-                        return false;
-                    }
+                        bool CardSourceCondition(CardSource cardSource)
+                        {
+                            if (cardSource.IsTamer)
+                            {
+                                if (cardSource.ContainsCardName("Matt Ishida"))
+                                {
+                                    return true;
+                                }
+                            }
 
-                    bool RootCondition(SelectCardEffect.Root root)
-                    {
-                        return true;
-                    }
+                            return false;
+                        }
 
-                    bool isUpDown()
-                    {
-                        return true;
-                    }
-                    #endregion
+                        bool RootCondition(SelectCardEffect.Root root)
+                        {
+                            return true;
+                        }
 
-                    if (card.Owner.HandCards.Count(CanSelectCardCondition) >= 1)
-                    {
-                        List<CardSource> selectedCards = new List<CardSource>();
+                        bool isUpDown()
+                        {
+                            return true;
+                        }
+                        #endregion
 
-                        int maxCount = 1;
+                        if (card.Owner.HandCards.Count(CanSelectCardCondition) >= 1)
+                        {
+                            List<CardSource> selectedCards = new List<CardSource>();
 
-                        SelectHandEffect selectHandEffect = GManager.instance.GetComponent<SelectHandEffect>();
+                            int maxCount = 1;
 
-                        selectHandEffect.SetUp(
-                            selectPlayer: card.Owner,
-                            canTargetCondition: CanSelectCardCondition,
-                            canTargetCondition_ByPreSelecetedList: null,
-                            canEndSelectCondition: null,
-                            maxCount: maxCount,
-                            canNoSelect: true,
-                            canEndNotMax: false,
-                            isShowOpponent: true,
-                            selectCardCoroutine: SelectCardCoroutine,
-                            afterSelectCardCoroutine: null,
-                            mode: SelectHandEffect.Mode.Custom,
-                            cardEffect: activateClass);
+                            SelectHandEffect selectHandEffect = GManager.instance.GetComponent<SelectHandEffect>();
 
-                        selectHandEffect.SetUpCustomMessage("Select 1 card to play.", "The opponent is selecting 1 card to play.");
-                        selectHandEffect.SetUpCustomMessage_ShowCard("Played Card");
+                            selectHandEffect.SetUp(
+                                selectPlayer: card.Owner,
+                                canTargetCondition: CanSelectCardCondition,
+                                canTargetCondition_ByPreSelecetedList: null,
+                                canEndSelectCondition: null,
+                                maxCount: maxCount,
+                                canNoSelect: true,
+                                canEndNotMax: false,
+                                isShowOpponent: true,
+                                selectCardCoroutine: SelectCardCoroutine,
+                                afterSelectCardCoroutine: null,
+                                mode: SelectHandEffect.Mode.Custom,
+                                cardEffect: activateClass);
 
-                        yield return StartCoroutine(selectHandEffect.Activate());
+                            selectHandEffect.SetUpCustomMessage("Select 1 card to play.", "The opponent is selecting 1 card to play.");
+                            selectHandEffect.SetUpCustomMessage_ShowCard("Played Card");
 
-                        IEnumerator SelectCardCoroutine(CardSource cardSource)
-                        {
-                            selectedCards.Add(cardSource);
+                            yield return StartCoroutine(selectHandEffect.Activate());
+
+                            IEnumerator SelectCardCoroutine(CardSource cardSource)
+                            {
+                                selectedCards.Add(cardSource);
 
-                            yield return null;
+                                yield return null;
+                            }
+
+                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.PlayPermanentCards(
+                                cardSources: selectedCards,
+                                activateClass: activateClass,
+                                payCost: true,
+                                isTapped: false,
+                                root: SelectCardEffect.Root.Hand,
+                                activateETB: true));
                         }
 
-                        yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.PlayPermanentCards(
-                            cardSources: selectedCards,
-                            activateClass: activateClass,
-                            payCost: true,
-                            isTapped: false,
-                            root: SelectCardEffect.Root.Hand,
-                            activateETB: true));
+                        #region release effect reducing play cost 
+                        card.Owner.UntilCalculateFixedCostEffect.Remove(getCardEffect);
+                        #endregion
                     }
-
-                    #region release effect reducing play cost 
-                    card.Owner.UntilCalculateFixedCostEffect.Remove(getCardEffect);
-                    #endregion
                 }
             }
         }

Assets/CardEffect/BT15/Blue/Pukumon_BT15_030.cs

@@ -68,8 +68,6 @@ public class Pukumon_BT15_030 : CEntity_Effect
 
             bool CanActivateCondition(Hashtable hashtable)
             {
-                if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
-                {
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
                         if (CardEffectCommons.CanTriggerOnPlay(hashtable, card))
@@ -77,8 +75,6 @@ public class Pukumon_BT15_030 : CEntity_Effect
                             return true;
                         }
                     }
-                }
-
 
                 return false;
             }

Assets/CardEffect/BT15/Green/Rosemon_X_Antibody_BT15_054.cs

@@ -150,6 +150,7 @@ public class Rosemon_X_Antibody_BT15_054 : CEntity_Effect
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Suspend 1 of your Opponent's Digimon", CanUseCondition, card);
             activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, true, EffectDiscription());
+            activateClass.SetHashString("Suspend1WhenPlayed_BT15_054");
             cardEffects.Add(activateClass);
 
             string EffectDiscription()
@@ -214,6 +215,7 @@ public class Rosemon_X_Antibody_BT15_054 : CEntity_Effect
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Suspend 1 of your Opponent's Digimon", CanUseCondition, card);
             activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, true, EffectDiscription());
+            activateClass.SetHashString("Suspend1FromBreeding_BT15_054");
             cardEffects.Add(activateClass);
 
             string EffectDiscription()

Assets/CardEffect/BT15/Red/Cannondramon_BT15_018.cs

@@ -26,7 +26,14 @@ public class Cannondramon_BT15_018 : CEntity_Effect
 
             bool CanSelectPermanentCondition(Permanent permanent)
             {
-                return CardEffectCommons.IsMinDP(permanent, card.Owner.Enemy);
+                if (CardEffectCommons.IsMinDP(permanent, card.Owner.Enemy))
+                {
+                    if(permanent.IsDigimon)
+                    {
+                        return true;
+                    }
+                }
+                return false;
             }
 
             bool CanUseCondition(Hashtable hashtable)
@@ -96,7 +103,14 @@ public class Cannondramon_BT15_018 : CEntity_Effect
 
             bool CanSelectPermanentCondition(Permanent permanent)
             {
-                return CardEffectCommons.IsMaxCost(permanent, card.Owner.Enemy, true);
+                if(CardEffectCommons.IsMaxCost(permanent, card.Owner.Enemy, true))
+                {
+                    if (permanent.IsDigimon)
+                    {
+                        return true;
+                    }
+                }
+                return false;
             }
 
             bool CanUseCondition(Hashtable hashtable)

Assets/CardEffect/BT15/Yellow/Magnadramon_BT15_042.cs

@@ -253,13 +253,13 @@ public class Magnadramon_BT15_042 : CEntity_Effect
                             mode: SelectPermanentEffect.Mode.Custom,
                             cardEffect: activateClass);
 
-                        selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon that will get DP -9000.", "The opponent is selecting 1 Digimon that will get DP -2000.");
+                        selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon that will get DP -9000.", "The opponent is selecting 1 Digimon that will get DP -9000.");
 
                         yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
 
                         IEnumerator SelectPermanentCoroutine(Permanent permanent)
                         {
-                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonDP(targetPermanent: permanent, changeValue: -9000, effectDuration: EffectDuration.UntilEachTurnEnd, activateClass: activateClass));
+                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonDP(targetPermanent: permanent, changeValue: -9000, effectDuration: EffectDuration.UntilOpponentTurnEnd, activateClass: activateClass));
                         }
                     }
                 }
@@ -356,13 +356,13 @@ public class Magnadramon_BT15_042 : CEntity_Effect
                             mode: SelectPermanentEffect.Mode.Custom,
                             cardEffect: activateClass);
 
-                        selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon that will get DP -9000.", "The opponent is selecting 1 Digimon that will get DP -2000.");
+                        selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon that will get DP -9000.", "The opponent is selecting 1 Digimon that will get DP -9000.");
 
                         yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
 
                         IEnumerator SelectPermanentCoroutine(Permanent permanent)
                         {
-                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonDP(targetPermanent: permanent, changeValue: -9000, effectDuration: EffectDuration.UntilEachTurnEnd, activateClass: activateClass));
+                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonDP(targetPermanent: permanent, changeValue: -9000, effectDuration: EffectDuration.UntilOpponentTurnEnd, activateClass: activateClass));
                         }
                     }
                 }

Assets/CardEffect/BT15/Yellow/Revelation_of_Light_BT15_092.cs

@@ -88,16 +88,19 @@ public class Revelation_of_Light_BT15_092 : CEntity_Effect
             {
                 if (CardEffectCommons.IsPermanentExistsOnOwnerBattleArea(permanent, card))
                 {
-                    if (permanent.IsTamer)
+                    if (card.Owner.CanAddSecurity(activateClass))
                     {
-                        if (permanent.TopCard.ContainsCardName("Kari Kamiya"))
+                        if (permanent.IsTamer)
                         {
-                            return true;
-                        }
-
-                        if (permanent.TopCard.ContainsCardName("KariKamiya"))
-                        {
-                            return true;
+                            if (permanent.TopCard.ContainsCardName("Kari Kamiya"))
+                            {
+                                return true;
+                            }
+
+                            if (permanent.TopCard.ContainsCardName("KariKamiya"))
+                            {
+                                return true;
+                            }
                         }
                     }
                 }
@@ -164,6 +167,7 @@ public class Revelation_of_Light_BT15_092 : CEntity_Effect
                     yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateRecoveryEffect(card.Owner));
 
                     yield return ContinuousController.instance.StartCoroutine(new IAddSecurity(card.Owner).AddSecurity());
+
                 }
             }
         }

Assets/CardEffect/BT15/Yellow/Salamon_BT15_034.cs

@@ -19,6 +19,7 @@ public class Salamon_BT15_034 : CEntity_Effect
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Give an opponent's Digimon card -2000 DP.", CanUseCondition, card);
             activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, false, EffectDiscription());
+            activateClass.SetHashString("-2000DP_BT15_034");
             activateClass.SetIsInheritedEffect(true);
             cardEffects.Add(activateClass);
 
@@ -38,12 +39,10 @@ public class Salamon_BT15_034 : CEntity_Effect
 
             bool CanUseCondition(Hashtable hashtable)
             {
-                if (CardEffectCommons.IsExistOnBattleArea(card))
+
+                if (CardEffectCommons.CanTriggerWhenLoseSecurity(hashtable, player => player == card.Owner))
                 {
-                    if (CardEffectCommons.CanTriggerWhenLoseSecurity(hashtable, player => player == card.Owner))
-                    {
-                        return true;
-                    }
+                    return true;
                 }
                 return false;
             }

Assets/CardEffect/BT16/Black/Dorugoramon_BT16_064.cs

@@ -95,22 +95,25 @@ namespace DCGO.CardEffects.BT16
                 {
                     if(card.PermanentOfThisCard().DigivolutionCards.Count(HasTamerWithTrait) > 0)
                     {
-                        SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
-
-                        selectPermanentEffect.SetUp(
-                            selectPlayer: card.Owner,
-                            canTargetCondition: CanSelectPermanentCondition,
-                            canTargetCondition_ByPreSelecetedList: null,
-                            canEndSelectCondition: null,
-                            maxCount: 1,
-                            canNoSelect: false,
-                            canEndNotMax: false,
-                            selectPermanentCoroutine: null,
-                            afterSelectPermanentCoroutine: null,
-                            mode: SelectPermanentEffect.Mode.Destroy,
-                            cardEffect: activateClass);
-
-                        yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
+                        if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
+                        {
+                            SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
+
+                            selectPermanentEffect.SetUp(
+                                selectPlayer: card.Owner,
+                                canTargetCondition: CanSelectPermanentCondition,
+                                canTargetCondition_ByPreSelecetedList: null,
+                                canEndSelectCondition: null,
+                                maxCount: 1,
+                                canNoSelect: false,
+                                canEndNotMax: false,
+                                selectPermanentCoroutine: null,
+                                afterSelectPermanentCoroutine: null,
+                                mode: SelectPermanentEffect.Mode.Destroy,
+                                cardEffect: activateClass);
+
+                            yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
+                        }
 
                     }
 

Assets/CardEffect/BT16/Green/Wormmon_BT16_040.cs

@@ -235,7 +235,7 @@ namespace DCGO.CardEffects.BT16
 
                 string EffectDiscription()
                 {
-                    return "[Start of Main Phase] If it's your turn, 1 of your Digimomn may digivolve into a level 4 Digimon card with the [Insectiod] or [Free] trait from your trash with the digivolution cost reduced by 1.";
+                    return "[On Play] If it's your turn, 1 of your Digimomn may digivolve into a level 4 Digimon card with the [Insectiod] or [Free] trait from your trash with the digivolution cost reduced by 1.";
                 }
 
 

Assets/CardEffect/BT7/Red/Ardamon_BT7_014.cs

@@ -118,25 +118,24 @@ public class Ardamon_BT7_014 : CEntity_Effect
                     {
                         if (card.PermanentOfThisCard().TopCard.ContainsTraits("Hybrid") || card.PermanentOfThisCard().TopCard.ContainsTraits("TenWarriors") || card.PermanentOfThisCard().TopCard.ContainsTraits("Ten Warriors"))
                         {
-                            if (card != card.PermanentOfThisCard().TopCard)
+
+                            if (cardEffect != null)
                             {
-                                if (cardEffect != null)
+                                if (cardEffect.EffectSourceCard != null)
                                 {
-                                    if (cardEffect.EffectSourceCard != null)
+                                    if (cardEffect.EffectSourceCard.IsOption)
                                     {
-                                        if (cardEffect.EffectSourceCard.IsOption)
+                                        if (cardEffect.IsSecurityEffect)
                                         {
-                                            if (cardEffect.IsSecurityEffect)
+                                            if (GManager.instance.attackProcess.AttackingPermanent == card.PermanentOfThisCard())
                                             {
-                                                if (GManager.instance.attackProcess.AttackingPermanent == card.PermanentOfThisCard())
-                                                {
-                                                    return true;
-                                                }
+                                                return true;
                                             }
                                         }
                                     }
                                 }
                             }
+                            
                         }
                     }
                 }

Assets/CardEffect/BT7/Yellow/CorializeBlust_BT7_100.cs

@@ -12,6 +12,29 @@ public class CorializeBlust_BT7_100 : CEntity_Effect
     {
         List<ICardEffect> cardEffects = new List<ICardEffect>();
 
+        if (timing == EffectTiming.SecuritySkill)
+        {
+            ActivateClass activateClass = new ActivateClass();
+            activateClass.SetUpICardEffect($"Add this card to hand", CanUseCondition, card);
+            activateClass.SetUpActivateClass(null, ActivateCoroutine, -1, false, EffectDiscription());
+            activateClass.SetIsSecurityEffect(true);
+            cardEffects.Add(activateClass);
+
+            string EffectDiscription()
+            {
+                return "[Security] Add this card to its owner's hand.";
+            }
+            bool CanUseCondition(Hashtable hashtable)
+            {
+                return CardEffectCommons.CanTriggerSecurityEffect(hashtable, card);
+            }
+
+            IEnumerator ActivateCoroutine(Hashtable _hashtable)
+            {
+                yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.AddThisCardToHand(card, activateClass));
+            }
+        }
+
         if (timing == EffectTiming.None)
         {
             int count()
@@ -33,7 +56,7 @@ public class CorializeBlust_BT7_100 : CEntity_Effect
             {
                 if (card.Owner.HandCards.Contains(card))
                 {
-                    if (count() >= 1)
+                    if (count() >= 0)
                     {
                         changeCostClass.SetEffectName($"Play Cost is {count()}");
 

Assets/CardEffect/BT7/Yellow/Pulsemon_BT7_032.cs

@@ -15,10 +15,10 @@ public class Pulsemon_BT7_032 : CEntity_Effect
         if (timing == EffectTiming.OnAllyAttack)
         {
             ActivateClass activateClass = new ActivateClass();
-            activateClass.SetUpICardEffect("Memory +1", CanUseCondition, card);
+            activateClass.SetUpICardEffect("Memory +2", CanUseCondition, card);
             activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, false, EffectDiscription());
             activateClass.SetIsInheritedEffect(true);
-            activateClass.SetHashString("Memory+1_BT7_032");
+            activateClass.SetHashString("Memory+2_BT7_032");
             cardEffects.Add(activateClass);
 
             string EffectDiscription()
@@ -46,7 +46,7 @@ public class Pulsemon_BT7_032 : CEntity_Effect
 
             IEnumerator ActivateCoroutine(Hashtable _hashtable)
             {
-                yield return ContinuousController.instance.StartCoroutine(card.Owner.AddMemory(1, activateClass));
+                yield return ContinuousController.instance.StartCoroutine(card.Owner.AddMemory(2, activateClass));
             }
         }
 

Assets/CardEffect/EX2/Purple/AiAndMakoto_EX2_065.cs

@@ -33,7 +33,14 @@ public class AiAndMakoto_EX2_065 : CEntity_Effect
                 return cardSource.CardNames.Contains("Beelzemon Blast Mode") || cardSource.CardNames.Contains("BeelzemonBlastMode");
             }
 
-            bool PermanentCondition(Permanent permanent) => CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card);
+            bool PermanentCondition(Permanent permanent)
+            {
+                if(CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent,card))
+                {
+                    return true;
+                }
+                return false;
+            }
 
             bool CanUseCondition(Hashtable hashtable)
             {