Просмотр исходного кода

Add trash DNA to takemikazuchi and change to EqualsCardName

Andrej Erdelsky 2 лет назад
Родитель
Сommit
1d0cd101bf

+ 4 - 4
Assets/CardEffect/BT17/Blue/Beowolfmon_BT17_026.cs

@@ -33,7 +33,7 @@ namespace DCGO.CardEffects.BT17
                     {
                         if (cardSource.Owner == card.Owner)
                         {
-                            if (cardSource.CardNames.Contains("Lobomon"))
+                            if (cardSource.EqualsCardName("Lobomon"))
                             {
                                 return true;
                             }
@@ -49,7 +49,7 @@ namespace DCGO.CardEffects.BT17
                     {
                         if (cardSource.Owner == card.Owner)
                         {
-                            if (cardSource.CardNames.Contains("KendoGarurumon"))
+                            if (cardSource.EqualsCardName("KendoGarurumon"))
                             {
                                 return true;
                             }
@@ -71,8 +71,8 @@ namespace DCGO.CardEffects.BT17
                                 {
                                     if (!permanent.IsToken)
                                     {
-                                        if (permanent.TopCard.CardNames.Contains("Koji Minamoto") ||
-                                            permanent.TopCard.CardNames.Contains("KojiMinamoto"))
+                                        if (permanent.TopCard.EqualsCardName("Koji Minamoto") ||
+                                            permanent.TopCard.EqualsCardName("KojiMinamoto"))
                                         {
                                             return true;
                                         }

+ 1 - 1
Assets/CardEffect/BT17/Blue/CerberusmonWerewolfMode_BT17_025.cs

@@ -18,7 +18,7 @@ namespace DCGO.CardEffects.BT17
                 // Alternate Digivolution
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.CardNames.Contains("Cerberusmon");
+                    return targetPermanent.TopCard.EqualsCardName("Cerberusmon");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(

+ 1 - 1
Assets/CardEffect/BT17/Blue/Gabumon_BT17_019.cs

@@ -19,7 +19,7 @@ namespace DCGO.CardEffects.BT17
             {
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.CardNames.Contains("Tsunomon");
+                    return targetPermanent.TopCard.EqualsCardName("Tsunomon");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(

+ 3 - 3
Assets/CardEffect/BT17/Blue/KendoGarurumon_BT17_023.cs

@@ -22,8 +22,8 @@ namespace DCGO.CardEffects.BT17
 
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.ContainsCardName("Koji  Minamoto") ||
-                           targetPermanent.TopCard.ContainsCardName("KojiMinamoto");
+                    return targetPermanent.TopCard.EqualsCardName("Koji  Minamoto") ||
+                           targetPermanent.TopCard.EqualsCardName("KojiMinamoto");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(
@@ -36,7 +36,7 @@ namespace DCGO.CardEffects.BT17
             {
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.ContainsCardName("Lobomon");
+                    return targetPermanent.TopCard.EqualsCardName("Lobomon");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(

+ 1 - 1
Assets/CardEffect/BT17/Blue/Labramon_BT17_021.cs

@@ -30,7 +30,7 @@ namespace DCGO.CardEffects.BT17
                 {
                     if (cardSource.IsDigimon)
                     {
-                        return cardSource.ContainsCardName("Seasarmon") ||
+                        return cardSource.EqualsCardName("Seasarmon") ||
                                (cardSource.IsLevel3 && cardSource.CardColors.Contains(CardColor.Blue));
                     }
 

+ 5 - 5
Assets/CardEffect/BT17/Blue/Lobomon_BT17_022.cs

@@ -22,8 +22,8 @@ namespace DCGO.CardEffects.BT17
 
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.ContainsCardName("Koji  Minamoto") ||
-                           targetPermanent.TopCard.ContainsCardName("KojiMinamoto");
+                    return targetPermanent.TopCard.EqualsCardName("Koji  Minamoto") ||
+                           targetPermanent.TopCard.EqualsCardName("KojiMinamoto");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(
@@ -36,7 +36,7 @@ namespace DCGO.CardEffects.BT17
             {
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.ContainsCardName("KendoGarurumon");
+                    return targetPermanent.TopCard.EqualsCardName("KendoGarurumon");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(
@@ -90,7 +90,7 @@ namespace DCGO.CardEffects.BT17
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
                         if (card.PermanentOfThisCard().DigivolutionCards.Count(cardSource =>
-                                cardSource.CardNames.Contains("KendoGarurumon")) >= 1)
+                                cardSource.EqualsCardName("KendoGarurumon")) >= 1)
                         {
                             return true;
                         }
@@ -120,7 +120,7 @@ namespace DCGO.CardEffects.BT17
                             CardEffectCommons.DigivolveIntoHandOrTrashCard(
                                 targetPermanent: thisPermanent,
                                 cardCondition: cardSource =>
-                                    cardSource.IsDigimon && cardSource.ContainsCardName("AncientGarurumon"),
+                                    cardSource.IsDigimon && cardSource.EqualsCardName("AncientGarurumon"),
                                 payCost: true,
                                 reduceCostTuple: null,
                                 fixedCostTuple: null,

+ 2 - 2
Assets/CardEffect/BT17/Blue/MetalGarurumon_BT17_027.cs

@@ -118,7 +118,7 @@ namespace DCGO.CardEffects.BT17
             {
                 if (CardEffectCommons.IsPermanentExistsOnOwnerBattleArea(permanent, card))
                 {
-                    if (permanent.TopCard.ContainsCardName("Agumon"))
+                    if (permanent.TopCard.EqualsCardName("Agumon"))
                     {
                         return true;
                     }
@@ -129,7 +129,7 @@ namespace DCGO.CardEffects.BT17
 
             bool CanSelectHandCardSharedCondition(CardSource cardSource)
             {
-                return cardSource.IsDigimon && cardSource.ContainsCardName("WarGreymon");
+                return cardSource.IsDigimon && cardSource.EqualsCardName("WarGreymon");
             }
 
             #endregion

+ 2 - 2
Assets/CardEffect/BT17/Blue/MinamiUehara_BT17_082.cs

@@ -32,8 +32,8 @@ namespace DCGO.CardEffects.BT17
                     {
                         if (cardSource.IsDigimon)
                         {
-                            return cardSource.ContainsCardName("Labramon") ||
-                                   cardSource.ContainsCardName("Seasarmon");
+                            return cardSource.EqualsCardName("Labramon") ||
+                                   cardSource.EqualsCardName("Seasarmon");
                         }
                     }
 

+ 2 - 2
Assets/CardEffect/BT17/Purple/CrackerFang_BT17_091.cs

@@ -158,8 +158,8 @@ namespace DCGO.CardEffects.BT17
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
                     return CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass) &&
-                           (cardSource.CardNames.Contains("Eiji Nagasumi") ||
-                            cardSource.CardNames.Contains("EijiNagasumi"));
+                           (cardSource.EqualsCardName("Eiji Nagasumi") ||
+                            cardSource.EqualsCardName("EijiNagasumi"));
                 }
 
                 bool CanUseCondition(Hashtable hashtable)

+ 3 - 5
Assets/CardEffect/BT17/Purple/DexDoruGreymon_BT17_067.cs

@@ -17,8 +17,7 @@ namespace DCGO.CardEffects.BT17
             {
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.ContainsCardName("DoruGreymon") &&
-                           !targetPermanent.TopCard.ContainsCardName("Dex");
+                    return targetPermanent.TopCard.EqualsCardName("DoruGreymon");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(
@@ -55,7 +54,7 @@ namespace DCGO.CardEffects.BT17
                 bool IsOwnerPermanentCondition(Permanent permanent)
                 {
                     return CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card) &&
-                           permanent.TopCard.ContainsCardName("DoruGreymon") &&
+                           permanent.TopCard.EqualsCardName("DoruGreymon") &&
                            card.CanPlayCardTargetFrame(permanent.PermanentFrame, false, activateClass, root: SelectCardEffect.Root.Trash);
                 }
 
@@ -154,8 +153,7 @@ namespace DCGO.CardEffects.BT17
                 bool IsDoruCardCondition(CardSource cardSource)
                 {
                     return cardSource.IsDigimon &&
-                           cardSource.ContainsCardName("DoruGreymon") &&
-                           !cardSource.ContainsCardName("Dex");
+                           cardSource.EqualsCardName("DoruGreymon");
                 }
                 
                 bool TrashRootCondition(SelectCardEffect.Root root)

+ 3 - 5
Assets/CardEffect/BT17/Purple/DexDorugamon_BT17_065.cs

@@ -17,8 +17,7 @@ namespace DCGO.CardEffects.BT17
             {
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.ContainsCardName("Dorugamon") &&
-                           !targetPermanent.TopCard.ContainsCardName("Dex");
+                    return targetPermanent.TopCard.EqualsCardName("Dorugamon");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(
@@ -55,7 +54,7 @@ namespace DCGO.CardEffects.BT17
                 bool IsOwnerPermanentCondition(Permanent permanent)
                 {
                     return CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card) &&
-                           permanent.TopCard.ContainsCardName("Dorugamon") &&
+                           permanent.TopCard.EqualsCardName("Dorugamon") &&
                            card.CanPlayCardTargetFrame(permanent.PermanentFrame, false, activateClass, root: SelectCardEffect.Root.Trash);
                 }
 
@@ -155,8 +154,7 @@ namespace DCGO.CardEffects.BT17
                 bool IsDoruCardCondition(CardSource cardSource)
                 {
                     return cardSource.IsDigimon &&
-                           cardSource.ContainsCardName("Dorugamon") &&
-                           !cardSource.ContainsCardName("Dex");
+                           cardSource.EqualsCardName("Dorugamon");
                 }
 
                 bool TrashRootCondition(SelectCardEffect.Root root)

+ 3 - 5
Assets/CardEffect/BT17/Purple/DexDorugoramon_BT17_073.cs

@@ -17,8 +17,7 @@ namespace DCGO.CardEffects.BT17
             {
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.ContainsCardName("Dorugoramon") &&
-                           !targetPermanent.TopCard.ContainsCardName("Dex");
+                    return targetPermanent.TopCard.EqualsCardName("Dorugoramon");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(
@@ -55,7 +54,7 @@ namespace DCGO.CardEffects.BT17
                 bool IsOwnerPermanentCondition(Permanent permanent)
                 {
                     return CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card) &&
-                           permanent.TopCard.ContainsCardName("Dorugoramon") &&
+                           permanent.TopCard.EqualsCardName("Dorugoramon") &&
                            card.CanPlayCardTargetFrame(permanent.PermanentFrame, false, activateClass, root: SelectCardEffect.Root.Trash);
                 }
 
@@ -155,8 +154,7 @@ namespace DCGO.CardEffects.BT17
                 bool IsDoruCardCondition(CardSource cardSource)
                 {
                     return cardSource.IsDigimon &&
-                           cardSource.ContainsCardName("Dorugoramon") &&
-                           !cardSource.ContainsCardName("Dex");
+                           cardSource.EqualsCardName("Dorugoramon");
                 }
 
                 bool TrashRootCondition(SelectCardEffect.Root root)

+ 4 - 5
Assets/CardEffect/BT17/Purple/Dorumon_BT17_062.cs

@@ -16,7 +16,7 @@ namespace DCGO.CardEffects.BT17
             {
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.ContainsCardName("Dorimon");
+                    return targetPermanent.TopCard.EqualsCardName("Dorimon");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(
@@ -50,15 +50,14 @@ namespace DCGO.CardEffects.BT17
                 bool IsDorugoramonCardCondition(CardSource cardSource)
                 {
                     return cardSource.IsDigimon &&
-                           cardSource.ContainsCardName("Dorugoramon") &&
-                           !cardSource.ContainsCardName("Dex");
+                           cardSource.EqualsCardName("Dorugoramon");
                 }
 
                 bool IsKosukeCardCondition(CardSource cardSource)
                 {
                     return cardSource.IsTamer &&
-                           (cardSource.ContainsCardName("Kosuke Kisakata") ||
-                            cardSource.ContainsCardName("KosukeKisakata"));
+                           (cardSource.EqualsCardName("Kosuke Kisakata") ||
+                            cardSource.EqualsCardName("KosukeKisakata"));
                 }
 
                 bool OpponentPermanentCondition(Permanent permanent)

+ 81 - 4
Assets/CardEffect/BT17/Purple/FenriloogamonTakemikazuchi_BT17_101.cs

@@ -2,6 +2,8 @@ using System.Collections;
 using System.Collections.Generic;
 using System;
 using System.Linq;
+using UnityEngine;
+using Photon.Pun;
 
 namespace DCGO.CardEffects
 {
@@ -43,7 +45,7 @@ namespace DCGO.CardEffects
                                             if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent,
                                                     card))
                                             {
-                                                if (permanent.TopCard.ContainsCardName("Fenriloogamon"))
+                                                if (permanent.TopCard.EqualsCardName("Fenriloogamon"))
                                                 {
                                                     return true;
                                                 }
@@ -69,7 +71,7 @@ namespace DCGO.CardEffects
                                             if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent,
                                                     card))
                                             {
-                                                if (permanent.TopCard.ContainsCardName("Kazuchimon"))
+                                                if (permanent.TopCard.EqualsCardName("Kazuchimon"))
                                                 {
                                                     return true;
                                                 }
@@ -138,8 +140,69 @@ namespace DCGO.CardEffects
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
-                    // TODO DNA digivolve
-                    yield return null;
+                    if (card.CanPlayJogress(true))
+                    {
+                        _jogressEvoRootsFrameIDs = Array.Empty<int>();
+
+                        yield return GManager.instance.photonWaitController.StartWait("FenriloogamonTakemikazuchi_BT17_101");
+
+                        if (card.Owner.isYou || GManager.instance.IsAI)
+                        {
+                            GManager.instance.selectJogressEffect.SetUp_SelectDigivolutionRoots
+                            (card: card,
+                                isLocal: true,
+                                isPayCost: true,
+                                canNoSelect: true,
+                                endSelectCoroutine_SelectDigivolutionRoots: EndSelectCoroutineSelectDigivolutionRoots,
+                                noSelectCoroutine: null);
+
+                            yield return ContinuousController.instance.StartCoroutine(GManager.instance.selectJogressEffect
+                                .SelectDigivolutionRoots());
+
+                            IEnumerator EndSelectCoroutineSelectDigivolutionRoots(List<Permanent> permanents)
+                            {
+                                if (permanents.Count == 2)
+                                {
+                                    _jogressEvoRootsFrameIDs =
+                                        permanents.Distinct().ToArray().Map(permanent => permanent.PermanentFrame.FrameID);
+                                }
+
+                                yield return null;
+                            }
+
+                            photonView.RPC("SetJogressEvoRootsFrameIDs", RpcTarget.All, _jogressEvoRootsFrameIDs);
+                        }
+
+                        else
+                        {
+                            GManager.instance.commandText.OpenCommandText("The opponent is choosing a card to DNA digivolve.");
+                        }
+
+                        yield return new WaitWhile(() => !_endSelect);
+                        _endSelect = false;
+
+                        GManager.instance.commandText.CloseCommandText();
+                        yield return new WaitWhile(() => GManager.instance.commandText.gameObject.activeSelf);
+
+                        if (_jogressEvoRootsFrameIDs.Length == 2)
+                        {
+                            yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>()
+                                .ShowCardEffect(new List<CardSource>() { card }, "Played Card", true, true));
+
+                            PlayCardClass playCard = new PlayCardClass(
+                                cardSources: new List<CardSource>() { card },
+                                hashtable: CardEffectCommons.CardEffectHashtable(activateClass),
+                                payCost: true,
+                                targetPermanent: null,
+                                isTapped: false,
+                                root: SelectCardEffect.Root.Trash,
+                                activateETB: true);
+
+                            playCard.SetJogress(_jogressEvoRootsFrameIDs);
+
+                            yield return ContinuousController.instance.StartCoroutine(playCard.PlayCard());
+                        }
+                    }
                 }
             }
 
@@ -292,5 +355,19 @@ namespace DCGO.CardEffects
 
             return cardEffects;
         }
+
+        #region DNA
+
+        private bool _endSelect;
+        private int[] _jogressEvoRootsFrameIDs = Array.Empty<int>();
+
+        [PunRPC]
+        public void SetJogressEvoRootsFrameIDs(int[] jogressEvoRootsFrameIDs)
+        {
+            _jogressEvoRootsFrameIDs = jogressEvoRootsFrameIDs;
+            _endSelect = true;
+        }
+
+        #endregion
     }
 }

+ 9 - 4
Assets/CardEffect/BT17/Purple/Fenriloogamon_BT17_069.cs

@@ -52,15 +52,20 @@ namespace DCGO.CardEffects.BT17
                 {
                     return cardSource.IsDigimon &&
                            CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass) &&
-                           (cardSource.ContainsCardName("Fenriloogamon") || cardSource.ContainsCardName("Kazuchimon"));
+                           (cardSource.EqualsCardName("Fenriloogamon") || cardSource.EqualsCardName("Kazuchimon"));
+                }
+                
+                bool IsEijiCardCondition(CardSource cardSource)
+                {
+                    return cardSource.IsTamer &&
+                           (cardSource.EqualsCardName("Eiji Nagasumi") ||
+                            cardSource.EqualsCardName("EijiNagasumi"));
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                     return CardEffectCommons.IsExistOnBattleArea(card) &&
-                           card.PermanentOfThisCard().DigivolutionCards.Count(cardSource =>
-                               cardSource.CardNames.Contains("Eiji Nagasumi") ||
-                               cardSource.CardNames.Contains("EijiNagasumi")) >= 1 &&
+                           card.PermanentOfThisCard().DigivolutionCards.Count(IsEijiCardCondition) >= 1 &&
                            CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectTrashCardCondition);
                 }
 

+ 1 - 1
Assets/CardEffect/BT17/Red/Agumon_BT17_007.cs

@@ -19,7 +19,7 @@ namespace DCGO.CardEffects.BT17
             {
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.CardNames.Contains("Koromon");
+                    return targetPermanent.TopCard.EqualsCardName("Koromon");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(

+ 5 - 5
Assets/CardEffect/BT17/Red/Agunimon_BT17_011.cs

@@ -22,8 +22,8 @@ namespace DCGO.CardEffects.BT17
 
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.ContainsCardName("Takuya Kanbara") ||
-                           targetPermanent.TopCard.ContainsCardName("TakuyaKanbara");
+                    return targetPermanent.TopCard.EqualsCardName("Takuya Kanbara") ||
+                           targetPermanent.TopCard.EqualsCardName("TakuyaKanbara");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(
@@ -36,7 +36,7 @@ namespace DCGO.CardEffects.BT17
             {
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.ContainsCardName("BurningGreymon");
+                    return targetPermanent.TopCard.EqualsCardName("BurningGreymon");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(
@@ -90,7 +90,7 @@ namespace DCGO.CardEffects.BT17
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
                         if (card.PermanentOfThisCard().DigivolutionCards.Count(cardSource =>
-                                cardSource.CardNames.Contains("BurningGreymon")) >= 1)
+                                cardSource.EqualsCardName("BurningGreymon")) >= 1)
                         {
                             return true;
                         }
@@ -120,7 +120,7 @@ namespace DCGO.CardEffects.BT17
                             CardEffectCommons.DigivolveIntoHandOrTrashCard(
                                 targetPermanent: thisPermanent,
                                 cardCondition: cardSource =>
-                                    cardSource.IsDigimon && cardSource.ContainsCardName("AncientGreymon"),
+                                    cardSource.IsDigimon && cardSource.EqualsCardName("AncientGreymon"),
                                 payCost: true,
                                 reduceCostTuple: null,
                                 fixedCostTuple: null,

+ 4 - 4
Assets/CardEffect/BT17/Red/Aldamon_BT17_014.cs

@@ -33,7 +33,7 @@ namespace DCGO.CardEffects.BT17
                     {
                         if (cardSource.Owner == card.Owner)
                         {
-                            if (cardSource.CardNames.Contains("Agunimon"))
+                            if (cardSource.EqualsCardName("Agunimon"))
                             {
                                 return true;
                             }
@@ -49,7 +49,7 @@ namespace DCGO.CardEffects.BT17
                     {
                         if (cardSource.Owner == card.Owner)
                         {
-                            if (cardSource.CardNames.Contains("BurningGreymon"))
+                            if (cardSource.EqualsCardName("BurningGreymon"))
                             {
                                 return true;
                             }
@@ -71,8 +71,8 @@ namespace DCGO.CardEffects.BT17
                                 {
                                     if (!permanent.IsToken)
                                     {
-                                        if (permanent.TopCard.CardNames.Contains("Takuya Kanbara") || 
-                                            permanent.TopCard.CardNames.Contains("TakuyaKanbara"))
+                                        if (permanent.TopCard.EqualsCardName("Takuya Kanbara") || 
+                                            permanent.TopCard.EqualsCardName("TakuyaKanbara"))
                                         {
                                             return true;
                                         }

+ 3 - 3
Assets/CardEffect/BT17/Red/BurningGreymon_BT17_012.cs

@@ -22,8 +22,8 @@ namespace DCGO.CardEffects.BT17
 
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.ContainsCardName("Takuya Kanbara") ||
-                           targetPermanent.TopCard.ContainsCardName("TakuyaKanbara");
+                    return targetPermanent.TopCard.EqualsCardName("Takuya Kanbara") ||
+                           targetPermanent.TopCard.EqualsCardName("TakuyaKanbara");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(
@@ -36,7 +36,7 @@ namespace DCGO.CardEffects.BT17
             {
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.ContainsCardName("Agunimon");
+                    return targetPermanent.TopCard.EqualsCardName("Agunimon");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(

+ 1 - 1
Assets/CardEffect/BT17/Red/Guilmon_BT17_008.cs

@@ -35,7 +35,7 @@ namespace DCGO.CardEffects.BT17
                     {
                         if (permanent.IsDigimon)
                         {
-                            return permanent.TopCard.ContainsCardName("Calumon");
+                            return permanent.TopCard.EqualsCardName("Calumon");
                         }
 
                         if (permanent.IsTamer)

+ 2 - 2
Assets/CardEffect/BT17/Red/WarGreymon_BT17_015.cs

@@ -118,7 +118,7 @@ namespace DCGO.CardEffects.BT17
             {
                 if (CardEffectCommons.IsPermanentExistsOnOwnerBattleArea(permanent, card))
                 {
-                    if (permanent.TopCard.ContainsCardName("Gabumon"))
+                    if (permanent.TopCard.EqualsCardName("Gabumon"))
                     {
                         return true;
                     }
@@ -129,7 +129,7 @@ namespace DCGO.CardEffects.BT17
 
             bool CanSelectHandCardSharedCondition(CardSource cardSource)
             {
-                return cardSource.IsDigimon && cardSource.ContainsCardName("MetalGarurumon");
+                return cardSource.IsDigimon && cardSource.EqualsCardName("MetalGarurumon");
             }
 
             #endregion