Apply requested changes

Assets/CardEffect/BT18/Black/AncientBeetlemon_BT18_072.cs

@@ -16,7 +16,7 @@ namespace DCGO.CardEffects.BT18
             {
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.IsLevel5 && targetPermanent.TopCard.ContainsTraits("Insectoid");
+                    return targetPermanent.TopCard.IsLevel5 && targetPermanent.TopCard.EqualsTraits("Insectoid");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(

Assets/CardEffect/BT18/Black/Beetlemon_BT18_063.cs

@@ -41,8 +41,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.EqualsCardName("J.P. Shibayama") ||
-                           targetPermanent.TopCard.EqualsCardName("J.P.Shibayama");
+                    return targetPermanent.TopCard.EqualsCardName("J.P. Shibayama");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(

Assets/CardEffect/BT18/Black/KoKabuterimon_BT18_057.cs

@@ -27,7 +27,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnBattleArea(card) &&
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
                            CardEffectCommons.IsOwnerTurn(card) &&
                            CardEffectCommons.CanTriggerWhenPermanentWouldDigivolve(hashtable,
                                DigivolveFromPermanentCondition, DigivolveToCardCondition);

Assets/CardEffect/BT18/Black/MetalKabuterimon_BT18_067.cs

@@ -40,8 +40,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.EqualsCardName("J.P. Shibayama") ||
-                           targetPermanent.TopCard.EqualsCardName("J.P.Shibayama");
+                    return targetPermanent.TopCard.EqualsCardName("J.P. Shibayama");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(

Assets/CardEffect/BT18/Black/RhinoKabuterimon_BT18_070.cs

@@ -16,7 +16,7 @@ namespace DCGO.CardEffects.BT18
             {
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.IsLevel4 && targetPermanent.TopCard.ContainsTraits("Hybrid")
+                    return targetPermanent.TopCard.IsLevel4 && targetPermanent.TopCard.EqualsTraits("Hybrid")
                                                             && (targetPermanent.TopCard.CardColors.Contains(CardColor.Black) ||
                                                                 targetPermanent.TopCard.CardColors.Contains(CardColor.Yellow));
                 }
@@ -290,6 +290,7 @@ namespace DCGO.CardEffects.BT18
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, false,
                     EffectDescription());
                 activateClass.SetIsInheritedEffect(true);
+                activateClass.SetHashString("-4000DP_BT18_70");
                 cardEffects.Add(activateClass);
 
                 string EffectDescription()

Assets/CardEffect/BT18/Blue/DaiPenmon_BT18_026.cs

@@ -16,7 +16,7 @@ namespace DCGO.CardEffects.BT18
             {
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.IsLevel4 && targetPermanent.TopCard.ContainsTraits("Hybrid")
+                    return targetPermanent.TopCard.IsLevel4 && targetPermanent.TopCard.EqualsTraits("Hybrid")
                                                             && (targetPermanent.TopCard.CardColors.Contains(CardColor.Blue) ||
                                                                 targetPermanent.TopCard.CardColors.Contains(CardColor.Red));
                 }

Assets/CardEffect/BT18/Blue/Korikakumon_BT18_025.cs

@@ -40,8 +40,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.EqualsCardName("Tommy Himi") ||
-                           targetPermanent.TopCard.EqualsCardName("TommyHimi");
+                    return targetPermanent.TopCard.EqualsCardName("Tommy Himi");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(

Assets/CardEffect/BT18/Blue/Kumamon_BT18_022.cs

@@ -41,8 +41,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.EqualsCardName("Tommy Himi") ||
-                           targetPermanent.TopCard.EqualsCardName("TommyHimi");
+                    return targetPermanent.TopCard.EqualsCardName("Tommy Himi");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(

Assets/CardEffect/BT18/Blue/Penguinmon_BT18_021.cs

@@ -27,7 +27,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnBattleArea(card) &&
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
                            CardEffectCommons.IsOwnerTurn(card) &&
                            CardEffectCommons.CanTriggerWhenPermanentWouldDigivolve(hashtable,
                                DigivolveFromPermanentCondition, DigivolveToCardCondition);

Assets/CardEffect/BT18/Green/JetSilphymon_BT18_053.cs

@@ -16,7 +16,7 @@ namespace DCGO.CardEffects.BT18
             {
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.IsLevel4 && targetPermanent.TopCard.ContainsTraits("Hybrid")
+                    return targetPermanent.TopCard.IsLevel4 && targetPermanent.TopCard.EqualsTraits("Hybrid")
                                                             && (targetPermanent.TopCard.CardColors.Contains(CardColor.Green) ||
                                                                 targetPermanent.TopCard.CardColors.Contains(CardColor.Red));
                 }

Assets/CardEffect/BT18/Green/Kazemon_BT18_048.cs

@@ -41,8 +41,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.EqualsCardName("Zoe Orimoto") ||
-                           targetPermanent.TopCard.EqualsCardName("ZoeOrimoto");
+                    return targetPermanent.TopCard.EqualsCardName("Zoe Orimoto");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(

Assets/CardEffect/BT18/Green/Tinkermon_BT18_043.cs

@@ -27,7 +27,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnBattleArea(card) &&
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
                            CardEffectCommons.IsOwnerTurn(card) &&
                            CardEffectCommons.CanTriggerWhenPermanentWouldDigivolve(hashtable,
                                DigivolveFromPermanentCondition, DigivolveToCardCondition);

Assets/CardEffect/BT18/Green/Zephyrmon_BT18_049.cs

@@ -40,8 +40,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.EqualsCardName("Zoe Orimoto") ||
-                           targetPermanent.TopCard.EqualsCardName("ZoeOrimoto");
+                    return targetPermanent.TopCard.EqualsCardName("Zoe Orimoto");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(

Assets/CardEffect/BT18/Purple/KaiserLeomon_BT18_077.cs

@@ -40,8 +40,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.EqualsCardName("Koichi Kimura") ||
-                           targetPermanent.TopCard.EqualsCardName("KoichiKimura");
+                    return targetPermanent.TopCard.EqualsCardName("Koichi Kimura");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(

Assets/CardEffect/BT18/Purple/Liollmon_BT18_075.cs

@@ -27,7 +27,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnBattleArea(card) &&
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
                            CardEffectCommons.IsOwnerTurn(card) &&
                            CardEffectCommons.CanTriggerWhenPermanentWouldDigivolve(hashtable,
                                DigivolveFromPermanentCondition, DigivolveToCardCondition);

Assets/CardEffect/BT18/Purple/Loweemon_BT18_076.cs

@@ -41,8 +41,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.EqualsCardName("Koichi Kimura") ||
-                           targetPermanent.TopCard.EqualsCardName("KoichiKimura");
+                    return targetPermanent.TopCard.EqualsCardName("Koichi Kimura");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(

Assets/CardEffect/BT18/Purple/Rhihimon_BT18_081.cs

@@ -16,7 +16,7 @@ namespace DCGO.CardEffects.BT18
             {
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.IsLevel4 && targetPermanent.TopCard.ContainsTraits("Hybrid")
+                    return targetPermanent.TopCard.IsLevel4 && targetPermanent.TopCard.EqualsTraits("Hybrid")
                                                             && (targetPermanent.TopCard.CardColors.Contains(CardColor.Purple) ||
                                                                 targetPermanent.TopCard.CardColors.Contains(CardColor.Yellow));
                 }
@@ -335,6 +335,7 @@ namespace DCGO.CardEffects.BT18
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, false,
                     EffectDescription());
                 activateClass.SetIsInheritedEffect(true);
+                activateClass.SetHashString("-4000DP_BT18_81");
                 cardEffects.Add(activateClass);
 
                 string EffectDescription()

Assets/CardEffect/BT18/Red/Agunimon_BT18_011.cs

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

Assets/CardEffect/BT18/Red/EmperorGreymon_BT18_018.cs

@@ -22,8 +22,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return (targetPermanent.TopCard.EqualsCardName("Takuya Kanbara") ||
-                            targetPermanent.TopCard.EqualsCardName("TakuyaKanbara")) &&
+                    return targetPermanent.TopCard.EqualsCardName("Takuya Kanbara") &&
                            targetPermanent.DigivolutionCards.Count(cardSource => cardSource.ContainsTraits("Hybrid")) >= 5;
                 }
 

Assets/CardEffect/BT18/Red/TakuyaKanbaraAndKojiMinamoto_BT18_088.cs

@@ -128,9 +128,7 @@ namespace DCGO.CardEffects.BT18
                     if (cardSource == card)
                     {
                         cardNames.Add("Takuya Kanbara");
-                        cardNames.Add("TakuyaKanbara");
                         cardNames.Add("Koji Minamoto");
-                        cardNames.Add("KojiMinamoto");
                     }
 
                     return cardNames;

Assets/CardEffect/BT18/White/Susanoomon_BT18_102.cs

@@ -23,9 +23,7 @@ namespace DCGO.CardEffects.BT18
                 bool PermanentCondition(Permanent targetPermanent)
                 {
                     return (targetPermanent.TopCard.EqualsCardName("Takuya Kanbara") ||
-                            targetPermanent.TopCard.EqualsCardName("TakuyaKanbara") ||
-                            targetPermanent.TopCard.EqualsCardName("Koji Minamoto") ||
-                            targetPermanent.TopCard.EqualsCardName("KojiMinamoto")) &&
+                            targetPermanent.TopCard.EqualsCardName("Koji Minamoto")) &&
                            targetPermanent.DigivolutionCards.Count(cardSource => cardSource.ContainsTraits("Hybrid")) >= 10;
                 }
 

Assets/CardEffect/BT18/Yellow/Lobomon_BT18_037.cs

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

Assets/CardEffect/BT18/Yellow/MagnaGarurumon_BT18_042.cs

@@ -21,8 +21,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return (targetPermanent.TopCard.EqualsCardName("Koji Minamoto") ||
-                            targetPermanent.TopCard.EqualsCardName("KojiMinamoto")) &&
+                    return targetPermanent.TopCard.EqualsCardName("Koji Minamoto") &&
                            targetPermanent.DigivolutionCards.Count(cardSource => cardSource.ContainsTraits("Hybrid")) >= 5;
                 }