Code cleanup - Implementing HasAdventureTraits on existing cards

Assets/CardEffect/ST20/Black/ST20_01.cs

@@ -15,7 +15,7 @@ namespace DCGO.CardEffects.ST20
             {
                 bool condition()
                 {
-                    return card.PermanentOfThisCard().TopCard.EqualsTraits("ADVENTURE");
+                    return card.PermanentOfThisCard().TopCard.HasAdventureTraits;
                 }
 
                 cardEffects.Add(CardEffectFactory.ChangeSelfDPStaticEffect(

Assets/CardEffect/ST20/Black/ST20_10.cs

@@ -15,7 +15,7 @@ namespace DCGO.CardEffects.ST20
             {
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return (targetPermanent.TopCard.EqualsTraits("ADVENTURE") || targetPermanent.TopCard.EqualsTraits("HERO")) && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 2;
+                    return (targetPermanent.TopCard.HasAdventureTraits || targetPermanent.TopCard.EqualsTraits("HERO")) && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 2;
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 0, ignoreDigivolutionRequirement: false, card: card, condition: null));

Assets/CardEffect/ST20/Black/ST20_11.cs

@@ -17,7 +17,7 @@ namespace DCGO.CardEffects.ST20
             {
                 bool PermanentCondition(Permanent permanent)
                 {
-                    return (permanent.TopCard.EqualsTraits("ADVENTURE") || permanent.TopCard.EqualsTraits("Hero")) 
+                    return (permanent.TopCard.HasAdventureTraits || permanent.TopCard.EqualsTraits("Hero"))
                         && permanent.Level == 5;
                 }
 

Assets/CardEffect/ST20/Black/ST20_13.cs

@@ -135,7 +135,7 @@ namespace DCGO.CardEffects.ST20
                 {
                     if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card))
                     {
-                        if (permanent.TopCard.EqualsTraits("ADVENTURE"))
+                        if (permanent.TopCard.HasAdventureTraits)
                         {
                             return true;
                         }

Assets/CardEffect/ST20/Black/ST20_14.cs

@@ -25,7 +25,7 @@ namespace DCGO.CardEffects.ST20
                 {
                     return CardEffectCommons.HasMatchConditionPermanent(permanent => 
                         CardEffectCommons.IsPermanentExistsOnOwnerBattleArea(permanent, card)
-                        && permanent.TopCard.EqualsTraits("ADVENTURE")
+                        && permanent.TopCard.HasAdventureTraits
                         && (permanent.IsTamer || permanent.IsDigimon), true);
                 }
 
@@ -118,7 +118,7 @@ namespace DCGO.CardEffects.ST20
                             if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
                             {
                                 return cardSource.IsDigimon &&
-                                        cardSource.EqualsTraits("ADVENTURE") &&
+                                        cardSource.HasAdventureTraits &&
                                         cardSource.Level <= 5;
                             }
 

Assets/CardEffect/ST20/Green/ST20_07.cs

@@ -15,7 +15,7 @@ namespace DCGO.CardEffects.ST20
             {
                 bool PermanentCondition(Permanent permanent)
                 {
-                    return permanent.Level == 2 && permanent.TopCard.EqualsTraits("ADVENTURE");
+                    return permanent.Level == 2 && permanent.TopCard.HasAdventureTraits;
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(PermanentCondition, 0, false, card, null));

Assets/CardEffect/ST20/Green/ST20_08.cs

@@ -16,7 +16,7 @@ namespace DCGO.CardEffects.ST20
             {
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.EqualsTraits("ADVENTURE") && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 3;
+                    return targetPermanent.TopCard.HasAdventureTraits && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 3;
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 2, ignoreDigivolutionRequirement: false, card: card, condition: null));
@@ -45,7 +45,7 @@ namespace DCGO.CardEffects.ST20
                 bool IsAdventureTamerCondition(CardSource cardSource)
                 {
                     return cardSource.IsTamer &&
-                           cardSource.EqualsTraits("ADVENTURE") &&
+                           cardSource.HasAdventureTraits &&
                            CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass);
                 }
 

Assets/CardEffect/ST20/Green/ST20_09.cs

@@ -15,7 +15,7 @@ namespace DCGO.CardEffects.ST20
             {
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.EqualsTraits("ADVENTURE") && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 4;
+                    return targetPermanent.TopCard.HasAdventureTraits && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 4;
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 3, ignoreDigivolutionRequirement: false, card: card, condition: null));
@@ -36,7 +36,7 @@ namespace DCGO.CardEffects.ST20
 
                 foreach (Permanent permanent in card.Owner.GetBattleAreaPermanents())
                 {
-                    if (permanent.IsTamer && permanent.TopCard.EqualsTraits("ADVENTURE"))
+                    if (permanent.IsTamer && permanent.TopCard.HasAdventureTraits)
                     {
                         tamerCards.Add(permanent.TopCard);
                     }
@@ -169,7 +169,7 @@ namespace DCGO.CardEffects.ST20
                 {
                     if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card) && permanent != card.PermanentOfThisCard())
                     {
-                        return permanent.TopCard.EqualsTraits("ADVENTURE");
+                        return permanent.TopCard.HasAdventureTraits;
                     }
                     return false;
                 }

Assets/CardEffect/ST20/Red/ST20_02.cs

@@ -15,7 +15,7 @@ namespace DCGO.CardEffects.ST20
             {
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.EqualsTraits("ADVENTURE") && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 2;
+                    return targetPermanent.TopCard.HasAdventureTraits && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 2;
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 0, ignoreDigivolutionRequirement: false, card: card, condition: null));
@@ -50,12 +50,12 @@ namespace DCGO.CardEffects.ST20
 
                 bool selectAdventureDigimon(CardSource source)
                 {
-                    return source.EqualsTraits("ADVENTURE") && source.IsDigimon;
+                    return source.HasAdventureTraits && source.IsDigimon;
                 }
 
                 bool selectAdventureTorO(CardSource source)
                 {
-                    return source.EqualsTraits("ADVENTURE") && (source.IsOption || source.IsTamer);
+                    return source.HasAdventureTraits && (source.IsOption || source.IsTamer);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

Assets/CardEffect/ST20/Red/ST20_03.cs

@@ -16,7 +16,7 @@ namespace DCGO.CardEffects.ST20
             {
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.EqualsTraits("ADVENTURE") && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 3;
+                    return targetPermanent.TopCard.HasAdventureTraits && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 3;
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 2, ignoreDigivolutionRequirement: false, card: card, condition: null));
@@ -32,7 +32,7 @@ namespace DCGO.CardEffects.ST20
 
                     foreach (Permanent permanent in card.Owner.GetBattleAreaPermanents())
                     {
-                        if (permanent.IsTamer && permanent.TopCard.EqualsTraits("ADVENTURE"))
+                        if (permanent.IsTamer && permanent.TopCard.HasAdventureTraits)
                         {
                             tamerCards.Add(permanent.TopCard);
                         }
@@ -66,7 +66,7 @@ namespace DCGO.CardEffects.ST20
 
                 bool CanDigivolveIntoCardCondition(CardSource cardSource)
                 {
-                    return cardSource.IsDigimon && cardSource.EqualsTraits("ADVENTURE");
+                    return cardSource.IsDigimon && cardSource.HasAdventureTraits;
                 }
 
 
@@ -107,7 +107,7 @@ namespace DCGO.CardEffects.ST20
 
                 bool CanDigivolveIntoCardCondition(CardSource cardSource)
                 {
-                    return cardSource.IsDigimon && cardSource.EqualsTraits("ADVENTURE");
+                    return cardSource.IsDigimon && cardSource.HasAdventureTraits;
                 }
 
 

Assets/CardEffect/ST20/Red/ST20_04.cs

@@ -15,7 +15,7 @@ namespace DCGO.CardEffects.ST20
             {
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.EqualsTraits("ADVENTURE") && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 4;
+                    return targetPermanent.TopCard.HasAdventureTraits && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 4;
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 3, ignoreDigivolutionRequirement: false, card: card, condition: null));
@@ -189,7 +189,7 @@ namespace DCGO.CardEffects.ST20
                 {
                     if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card) && permanent != card.PermanentOfThisCard())
                     {
-                        return permanent.TopCard.EqualsTraits("ADVENTURE");
+                        return permanent.TopCard..HasAdventureTraits;
                     }
                     return false;
                 }

Assets/CardEffect/ST20/Red/ST20_12.cs

@@ -42,7 +42,7 @@ namespace DCGO.CardEffects.ST20
                     {
                         if (card.Owner.CanAddMemory(activateClass))
                         {
-                            if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, permanent => permanent.IsDigimon && permanent.TopCard.EqualsTraits("ADVENTURE"))){
+                            if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, permanent => permanent.IsDigimon && permanent.TopCard.HasAdventureTraits))
                                 return true;
                             }
                         }

Assets/CardEffect/ST20/Yellow/ST20_05.cs

@@ -15,7 +15,7 @@ namespace DCGO.CardEffects.ST20
             {
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.EqualsTraits("ADVENTURE") && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 3;
+                    return targetPermanent.TopCard.HasAdventureTraits && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 3;
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 2, ignoreDigivolutionRequirement: false, card: card, condition: null));

Assets/CardEffect/ST20/Yellow/ST20_06.cs

@@ -16,7 +16,7 @@ namespace DCGO.CardEffects.ST20
             {
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.EqualsTraits("ADVENTURE") && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 4;
+                    return targetPermanent.TopCard.HasAdventureTraits && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 4;
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 3, ignoreDigivolutionRequirement: false, card: card, condition: null));
@@ -53,7 +53,7 @@ namespace DCGO.CardEffects.ST20
                         {
                             foreach (CardSource cardSource in card.Owner.HandCards)
                             {
-                                if (cardSource.EqualsTraits("ADVENTURE"))
+                                if (cardSource.HasAdventureTraits)
                                 {
                                     if (cardSource.CanPlayCardTargetFrame(permanent.PermanentFrame, false, activateClass))
                                     {
@@ -69,7 +69,7 @@ namespace DCGO.CardEffects.ST20
 
                 bool ValidDigivolveIntoHand(CardSource source)
                 {
-                    return source.EqualsTraits("ADVENTURE");
+                    return source.HasAdventureTraits;
                 }
 
                 bool CanUseCondition(Hashtable hashtable)
@@ -158,7 +158,7 @@ namespace DCGO.CardEffects.ST20
                         {
                             foreach (CardSource cardSource in card.Owner.HandCards)
                             {
-                                if (cardSource.EqualsTraits("ADVENTURE"))
+                                if (cardSource.HasAdventureTraits)
                                 {
                                     if (cardSource.CanPlayCardTargetFrame(permanent.PermanentFrame, false, activateClass))
                                     {
@@ -174,7 +174,7 @@ namespace DCGO.CardEffects.ST20
 
                 bool ValidDigivolveIntoHand(CardSource source)
                 {
-                    return source.EqualsTraits("ADVENTURE");
+                    return source.HasAdventureTraits;
                 }
 
                 
@@ -258,7 +258,7 @@ namespace DCGO.CardEffects.ST20
                 {
                     if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card) && permanent != card.PermanentOfThisCard())
                     {
-                        return permanent.TopCard.EqualsTraits("ADVENTURE");
+                        return permanent.TopCard.HasAdventureTraits;
                     }
                     return false;
                 }

Assets/CardEffect/ST21/Blue/ST21_02.cs

@@ -15,7 +15,7 @@ namespace DCGO.CardEffects.ST21
             {
                 bool PermanentCondition(Permanent permanent)
                 {
-                    return permanent.Level == 2 && permanent.TopCard.EqualsTraits("ADVENTURE");
+                    return permanent.Level == 2 && permanent.TopCard.HasAdventureTraits;
                 }
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(PermanentCondition, 0, false, card, null));
             }

Assets/CardEffect/ST21/Blue/ST21_03.cs

@@ -16,7 +16,7 @@ namespace DCGO.CardEffects.ST21
             {
                 bool PermanentCondition(Permanent permanent)
                 {
-                    return permanent.Level == 3 && permanent.TopCard.EqualsTraits("ADVENTURE");
+                    return permanent.Level == 3 && permanent.TopCard.HasAdventureTraits;
                 }
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(PermanentCondition, 2, false, card, null));
             }

Assets/CardEffect/ST21/Blue/ST21_04.cs

@@ -17,7 +17,7 @@ namespace DCGO.CardEffects.ST21
             {
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.EqualsTraits("ADVENTURE") && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 4;
+                    return targetPermanent.TopCard.HasAdventureTraits && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 4;
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 3, ignoreDigivolutionRequirement: false, card: card, condition: null));
@@ -37,7 +37,7 @@ namespace DCGO.CardEffects.ST21
 
                 foreach (Permanent permanent in card.Owner.GetBattleAreaPermanents())
                 {
-                    if (permanent.IsTamer && permanent.TopCard.EqualsTraits("ADVENTURE"))
+                    if (permanent.IsTamer && permanent.TopCard.HasAdventureTraits)
                     {
                         tamerCards.Add(permanent.TopCard);
                     }
@@ -197,7 +197,7 @@ namespace DCGO.CardEffects.ST21
                 {
                     if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card) && permanent != card.PermanentOfThisCard())
                     {
-                        return permanent.TopCard.EqualsTraits("ADVENTURE");
+                        return permanent.TopCard.HasAdventureTraits;
                     }
                     return false;
                 }

Assets/CardEffect/ST21/Blue/ST21_12.cs

@@ -43,7 +43,7 @@ namespace DCGO.CardEffects.ST21
                     {
                         if (card.Owner.CanAddMemory(activateClass))
                         {
-                            if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, permanent => permanent.IsDigimon && permanent.TopCard.EqualsTraits("ADVENTURE")))
+                            if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, permanent => permanent.IsDigimon && permanent.TopCard.HasAdventureTraits))
                             {
                                 return true;
                             }

Assets/CardEffect/ST21/Green/ST21_07.cs

@@ -14,7 +14,7 @@ namespace DCGO.CardEffects.ST21
             {
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.EqualsTraits("ADVENTURE") && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 2;
+                    return targetPermanent.TopCard.HasAdventureTraits && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 2;
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 0, ignoreDigivolutionRequirement: false, card: card, condition: null));

Assets/CardEffect/ST21/Green/ST21_08.cs

@@ -16,7 +16,7 @@ namespace DCGO.CardEffects.ST21
             {
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.EqualsTraits("ADVENTURE") && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 3;
+                    return targetPermanent.TopCard.HasAdventureTraits && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 3;
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 2, ignoreDigivolutionRequirement: false, card: card, condition: null));
@@ -32,7 +32,7 @@ namespace DCGO.CardEffects.ST21
 
                     foreach (Permanent permanent in card.Owner.GetBattleAreaPermanents())
                     {
-                        if (permanent.IsTamer && permanent.TopCard.EqualsTraits("ADVENTURE"))
+                        if (permanent.IsTamer && permanent.TopCard.HasAdventureTraits)
                         {
                             tamerCards.Add(permanent.TopCard);
                         }
@@ -66,7 +66,7 @@ namespace DCGO.CardEffects.ST21
 
                 bool CanDigivolveIntoCardCondition(CardSource cardSource)
                 {
-                    return cardSource.IsDigimon && cardSource.EqualsTraits("ADVENTURE");
+                    return cardSource.IsDigimon && cardSource.HasAdventureTraits;
                 }
 
 
@@ -107,7 +107,7 @@ namespace DCGO.CardEffects.ST21
 
                 bool CanDigivolveIntoCardCondition(CardSource cardSource)
                 {
-                    return cardSource.IsDigimon && cardSource.EqualsTraits("ADVENTURE");
+                    return cardSource.IsDigimon && cardSource.HasAdventureTraits;
                 }
 
 

Assets/CardEffect/ST21/Green/ST21_09.cs

@@ -16,7 +16,7 @@ namespace DCGO.CardEffects.ST21
             {
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.EqualsTraits("ADVENTURE") && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 4;
+                    return targetPermanent.TopCard.HasAdventureTraits && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 4;
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 3, ignoreDigivolutionRequirement: false, card: card, condition: null));
@@ -36,7 +36,7 @@ namespace DCGO.CardEffects.ST21
 
                 foreach (Permanent permanent in card.Owner.GetBattleAreaPermanents())
                 {
-                    if (permanent.IsTamer && permanent.TopCard.EqualsTraits("ADVENTURE"))
+                    if (permanent.IsTamer && permanent.TopCard.HasAdventureTraits)
                     {
                         tamerCards.Add(permanent.TopCard);
                     }
@@ -173,7 +173,7 @@ namespace DCGO.CardEffects.ST21
                 {
                     if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card) && permanent != card.PermanentOfThisCard())
                     {
-                        return permanent.TopCard.EqualsTraits("ADVENTURE");
+                        return permanent.TopCard.HasAdventureTraits;
                     }
                     return false;
                 }

Assets/CardEffect/ST21/Purple/ST21_01.cs

@@ -47,7 +47,7 @@ namespace DCGO.CardEffects.ST21
                 {
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.EqualsTraits("ADVENTURE"))
+                        if (cardSource.HasAdventureTraits)
                         {
                             return true;
                         }

Assets/CardEffect/ST21/Purple/ST21_10.cs

@@ -16,7 +16,7 @@ namespace DCGO.CardEffects.ST21
             {
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return (targetPermanent.TopCard.EqualsTraits("ADVENTURE") || targetPermanent.TopCard.EqualsTraits("HERO")) && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 2;
+                    return (targetPermanent.TopCard.HasAdventureTraits || targetPermanent.TopCard.EqualsTraits("HERO")) && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 2;
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 0, ignoreDigivolutionRequirement: false, card: card, condition: null));

Assets/CardEffect/ST21/Purple/ST21_11.cs

@@ -15,7 +15,7 @@ namespace DCGO.CardEffects.ST21
             {
                 bool PermanentCondition(Permanent permanent)
                 {
-                    return permanent.Level == 5 && permanent.TopCard.EqualsTraits("ADVENTURE");
+                    return permanent.Level == 5 && permanent.TopCard.HasAdventureTraits;
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(PermanentCondition, 3, false, card, null));
@@ -37,7 +37,7 @@ namespace DCGO.CardEffects.ST21
                         && CardEffectCommons.HasMatchConditionOpponentsPermanent(card, CanSelectPermanentCondition);
             }
 
-            bool CanGetCardColour(Permanent permanent) => permanent.IsTamer && permanent.TopCard.EqualsTraits("ADVENTURE") && permanent.TopCard.Owner == card.Owner;
+            bool CanGetCardColour(Permanent permanent) => permanent.IsTamer && permanent.TopCard.HasAdventureTraits && permanent.TopCard.Owner == card.Owner;
 
             bool CanSelectPermanentCondition(Permanent permanent)
             {

Assets/CardEffect/ST21/Purple/ST21_13.cs

@@ -134,7 +134,7 @@ namespace DCGO.CardEffects.ST21
                 {
                     if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card))
                     {
-                        if (permanent.TopCard.EqualsTraits("ADVENTURE") && permanent.Level >= 5)
+                        if (permanent.TopCard.HasAdventureTraits && permanent.Level >= 5)
                         {
                             return true;
                         }

Assets/CardEffect/ST21/Purple/ST21_14.cs

@@ -20,7 +20,7 @@ namespace DCGO.CardEffects.ST21
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.HasMatchConditionPermanent((permanent) => (permanent.IsTamer || permanent.IsDigimon) && permanent.TopCard.EqualsTraits("ADVENTURE"), true);
+                    return CardEffectCommons.HasMatchConditionPermanent((permanent) => (permanent.IsTamer || permanent.IsDigimon) && permanent.TopCard.HasAdventureTraits, true);
                 }
 
                 bool CardCondition(CardSource cardSource)
@@ -50,7 +50,7 @@ namespace DCGO.CardEffects.ST21
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    return cardSource.EqualsTraits("ADVENTURE");
+                    return cardSource.HasAdventureTraits;
                 }
 
                 bool CanUseCondition(Hashtable hashtable)

Assets/CardEffect/ST21/Yellow/ST21_05.cs

@@ -17,7 +17,7 @@ namespace DCGO.CardEffects.ST21
             {
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.EqualsTraits("ADVENTURE") && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 3;
+                    return targetPermanent.TopCard.HasAdventureTraits && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 3;
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 2, ignoreDigivolutionRequirement: false, card: card, condition: null));

Assets/CardEffect/ST21/Yellow/ST21_06.cs

@@ -15,7 +15,7 @@ namespace DCGO.CardEffects.ST21
             {
                 static bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.EqualsTraits("ADVENTURE") && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 4;
+                    return targetPermanent.TopCard.HasAdventureTraits && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 4;
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 3, ignoreDigivolutionRequirement: false, card: card, condition: null));
@@ -29,7 +29,7 @@ namespace DCGO.CardEffects.ST21
 
                 foreach (Permanent permanent in card.Owner.GetBattleAreaPermanents())
                 {
-                    if (permanent.IsTamer && permanent.TopCard.EqualsTraits("ADVENTURE"))
+                    if (permanent.IsTamer && permanent.TopCard.HasAdventureTraits)
                     {
                         tamerCards.Add(permanent.TopCard);
                     }
@@ -190,7 +190,7 @@ namespace DCGO.CardEffects.ST21
                 {
                     if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card) && permanent != card.PermanentOfThisCard())
                     {
-                        return permanent.TopCard.EqualsTraits("ADVENTURE");
+                        return permanent.TopCard.HasAdventureTraits;
                     }
                     return false;
                 }