Change how Card Colors are checked for searches

Assets/Scripts/CardEffect/AD1/Red/AD1_002.cs

@@ -158,9 +158,9 @@ namespace DCGO.CardEffects.AD1
                 bool CanSelectPlayCondition(CardSource cardSource)
                 {
                     return cardSource.IsTamer
-                        && (cardSource.CardColors.Contains(CardColor.Red)
-                            || cardSource.CardColors.Contains(CardColor.Blue)
-                            || cardSource.CardColors.Contains(CardColor.Green))
+                        && (cardSource.HasCardColor(CardColor.Red)
+                            || cardSource.HasCardColor(CardColor.Blue)
+                            || cardSource.HasCardColor(CardColor.Green))
                         && cardSource.HasInheritedEffect
                         && CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass);
                 }

Assets/Scripts/CardEffect/AD1/Yellow/AD1_015.cs

@@ -126,9 +126,9 @@ namespace DCGO.CardEffects.AD1
             bool CanPlayTamerCondition(CardSource cardSource)
             {
                 return cardSource.IsTamer
-                    && (cardSource.CardColors.Contains(CardColor.Yellow)
-                        || cardSource.CardColors.Contains(CardColor.Black)
-                        || cardSource.CardColors.Contains(CardColor.Purple))
+                    && (cardSource.HasCardColor(CardColor.Yellow)
+                        || cardSource.HasCardColor(CardColor.Black)
+                        || cardSource.HasCardColor(CardColor.Purple))
                     && cardSource.HasInheritedEffect;
             }
 

Assets/Scripts/CardEffect/AD1/Yellow/AD1_021.cs

@@ -68,7 +68,7 @@ namespace DCGO.CardEffects.AD1
 
                 bool CanSelectGreymonCard(CardSource cardSource)
                 {
-                    return cardSource.CardColors.Contains(CardColor.Yellow)
+                    return cardSource.HasCardColor(CardColor.Yellow)
                         && cardSource.ContainsCardName("Greymon");
                 }
 

Assets/Scripts/CardEffect/BT1/Green/BT1_078.cs

@@ -30,7 +30,7 @@ public class BT1_078 : CEntity_Effect
                 {
                     if (cardSource.Level == 6)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Green))
+                        if (cardSource.HasCardColor(CardColor.Green))
                         {
                             if (CardEffectCommons.IsExistOnBattleArea(card))
                             {

Assets/Scripts/CardEffect/BT1/Yellow/BT1_048.cs

@@ -28,7 +28,7 @@ public class BT1_048 : CEntity_Effect
             {
                 if (cardSource.IsTamer)
                 {
-                    if (cardSource.CardColors.Contains(CardColor.Yellow))
+                    if (cardSource.HasCardColor(CardColor.Yellow))
                     {
                         return true;
                     }

Assets/Scripts/CardEffect/BT1/Yellow/BT1_087.cs

@@ -101,7 +101,7 @@ public class BT1_087 : CEntity_Effect
 
                     if (selectedCard != null)
                     {
-                        if (selectedCard.CardColors.Contains(CardColor.Yellow))
+                        if (selectedCard.HasCardColor(CardColor.Yellow))
                         {
                             yield return ContinuousController.instance.StartCoroutine(new IRecovery(card.Owner, 1, activateClass).Recovery());
                         }

Assets/Scripts/CardEffect/BT10/Black/BT10_058.cs

@@ -33,7 +33,7 @@ namespace DCGO.CardEffects.BT10
                         return true;
                     }
 
-                    if (cardSource.CardColors.Contains(CardColor.Black))
+                    if (cardSource.HasCardColor(CardColor.Black))
                     {
                         if (cardSource.ContainsCardName("Knightmon"))
                         {

Assets/Scripts/CardEffect/BT10/Black/BT10_066.cs

@@ -139,7 +139,7 @@ namespace DCGO.CardEffects.BT10
                 {
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Black))
+                        if (cardSource.HasCardColor(CardColor.Black))
                         {
                             if (cardSource.Level <= 4)
                             {

Assets/Scripts/CardEffect/BT10/Black/BT10_069.cs

@@ -40,7 +40,7 @@ namespace DCGO.CardEffects.BT10
                 {
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Black) || cardSource.CardColors.Contains(CardColor.Purple))
+                        if (cardSource.HasCardColor(CardColor.Black) || cardSource.HasCardColor(CardColor.Purple))
                         {
                             if (!cardSource.EqualsCardName("DarkKnightmon (X Antibody)"))
                             {

Assets/Scripts/CardEffect/BT10/Black/BT10_106.cs

@@ -220,7 +220,7 @@ namespace DCGO.CardEffects.BT10
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    if (cardSource.CardColors.Contains(CardColor.Black))
+                    if (cardSource.HasCardColor(CardColor.Black))
                     {
                         if (cardSource.IsTamer)
                         {

Assets/Scripts/CardEffect/BT10/Purple/BT10_072.cs

@@ -30,7 +30,7 @@ namespace DCGO.CardEffects.BT10
                 {
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Purple))
+                        if (cardSource.HasCardColor(CardColor.Purple))
                         {
                             return true;
                         }

Assets/Scripts/CardEffect/BT10/Purple/BT10_080.cs

@@ -49,7 +49,7 @@ namespace DCGO.CardEffects.BT10
                 {
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Purple))
+                        if (cardSource.HasCardColor(CardColor.Purple))
                         {
                             if (cardSource.CardTraits.Contains("Undead"))
                             {

Assets/Scripts/CardEffect/BT10/Purple/BT10_083.cs

@@ -35,7 +35,7 @@ namespace DCGO.CardEffects.BT10
                 {
                     if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Purple))
+                        if (cardSource.HasCardColor(CardColor.Purple))
                         {
                             if (cardSource.Level <= 4)
                             {
@@ -150,7 +150,7 @@ namespace DCGO.CardEffects.BT10
                             return true;
                         }
 
-                        if (cardSource.CardColors.Contains(CardColor.Purple))
+                        if (cardSource.HasCardColor(CardColor.Purple))
                         {
                             if (cardSource.Level <= 5)
                             {

Assets/Scripts/CardEffect/BT10/Purple/BT10_093.cs

@@ -35,7 +35,7 @@ namespace DCGO.CardEffects.BT10
                                 hashtable: hashtable,
                                 permanentCondition: permanent => permanent == card.PermanentOfThisCard(),
                                 cardEffectCondition: null,
-                                cardCondition: cardSource => cardSource.CardColors.Contains(CardColor.Purple)))
+                                cardCondition: cardSource => cardSource.HasCardColor(CardColor.Purple)))
                         {
                             return true;
                         }
@@ -114,7 +114,7 @@ namespace DCGO.CardEffects.BT10
             {
                 if (CardEffectCommons.IsExistOnBattleArea(card))
                 {
-                    if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, (permanent) => permanent.IsTamer && permanent.DigivolutionCards.Count((cardSource) => cardSource.IsDigimon && cardSource.CardColors.Contains(CardColor.Purple) && GManager.instance.GetComponent<SelectDigiXrosClass>().addDigivolutionCardInfos.Count((addDigivolutionCardInfo) => addDigivolutionCardInfo.cardSources.Contains(cardSource)) == 0) >= 1))
+                    if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, (permanent) => permanent.IsTamer && permanent.DigivolutionCards.Count((cardSource) => cardSource.IsDigimon && cardSource.HasCardColor(CardColor.Purple) && GManager.instance.GetComponent<SelectDigiXrosClass>().addDigivolutionCardInfos.Count((addDigivolutionCardInfo) => addDigivolutionCardInfo.cardSources.Contains(cardSource)) == 0) >= 1))
                     {
                         return true;
                     }
@@ -125,7 +125,7 @@ namespace DCGO.CardEffects.BT10
 
             IEnumerator ActivateCoroutine2(Hashtable _hashtable)
             {
-                if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, (permanent) => permanent.IsTamer && permanent.DigivolutionCards.Count((cardSource) => cardSource.IsDigimon && cardSource.CardColors.Contains(CardColor.Purple)) >= 1))
+                if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, (permanent) => permanent.IsTamer && permanent.DigivolutionCards.Count((cardSource) => cardSource.IsDigimon && cardSource.HasCardColor(CardColor.Purple)) >= 1))
                 {
                     List<CardSource> digivolutionCards = new List<CardSource>();
 
@@ -135,7 +135,7 @@ namespace DCGO.CardEffects.BT10
                         {
                             if (GManager.instance.GetComponent<SelectDigiXrosClass>().addDigivolutionCardInfos.Count((addDigivolutionCardInfo) => addDigivolutionCardInfo.cardSources.Contains(cardSource)) == 0)
                             {
-                                if (cardSource.CardColors.Contains(CardColor.Purple))
+                                if (cardSource.HasCardColor(CardColor.Purple))
                                 {
                                     if (cardSource.IsDigimon)
                                     {
@@ -415,7 +415,7 @@ namespace DCGO.CardEffects.BT10
                                 {
                                     if (permanent.IsTamer)
                                     {
-                                        maxCount += permanent.DigivolutionCards.Count((cardSource) => cardSource.CardColors.Contains(CardColor.Purple) && cardSource.IsDigimon);
+                                        maxCount += permanent.DigivolutionCards.Count((cardSource) => cardSource.HasCardColor(CardColor.Purple) && cardSource.IsDigimon);
                                     }
 
                                     if (maxCount >= 3)

Assets/Scripts/CardEffect/BT10/Yellow/BT10_032.cs

@@ -43,7 +43,7 @@ namespace DCGO.CardEffects.BT10
                 {
                     if (cardSource.IsTamer)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Yellow))
+                        if (cardSource.HasCardColor(CardColor.Yellow))
                         {
                             return true;
                         }

Assets/Scripts/CardEffect/BT10/Yellow/BT10_041.cs

@@ -35,7 +35,7 @@ namespace DCGO.CardEffects.BT10
                             return true;
                         }
 
-                        if (cardSource.CardColors.Contains(CardColor.Yellow))
+                        if (cardSource.HasCardColor(CardColor.Yellow))
                         {
                             if (cardSource.GetCostItself <= 5)
                             {

Assets/Scripts/CardEffect/BT11/Black/BT11_062.cs

@@ -49,7 +49,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanSelectCardCondition1(CardSource cardSource)
                 {
-                    if (cardSource.CardColors.Contains(CardColor.Black))
+                    if (cardSource.HasCardColor(CardColor.Black))
                     {
                         if (cardSource.IsTamer)
                         {
@@ -133,7 +133,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanSelectCardCondition1(CardSource cardSource)
                 {
-                    if (cardSource.CardColors.Contains(CardColor.Black))
+                    if (cardSource.HasCardColor(CardColor.Black))
                     {
                         if (cardSource.IsTamer)
                         {

Assets/Scripts/CardEffect/BT11/Black/BT11_071.cs

@@ -490,7 +490,7 @@ namespace DCGO.CardEffects.BT11
                 {
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Black) || cardSource.CardColors.Contains(CardColor.Purple))
+                        if (cardSource.HasCardColor(CardColor.Black) || cardSource.HasCardColor(CardColor.Purple))
                         {
                             return true;
                         }

Assets/Scripts/CardEffect/BT11/Black/BT11_106.cs

@@ -225,7 +225,7 @@ namespace DCGO.CardEffects.BT11
                             {
                                 if (cardSource.IsDigimon)
                                 {
-                                    if (cardSource.CardColors.Contains(CardColor.Black))
+                                    if (cardSource.HasCardColor(CardColor.Black))
                                     {
                                         return true;
                                     }

Assets/Scripts/CardEffect/BT11/Blue/BT11_020.cs

@@ -39,7 +39,7 @@ namespace DCGO.CardEffects.BT11
                 {
                     if (cardSource.IsTamer)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Blue))
+                        if (cardSource.HasCardColor(CardColor.Blue))
                         {
                             return true;
                         }

Assets/Scripts/CardEffect/BT11/Blue/BT11_023.cs

@@ -38,7 +38,7 @@ namespace DCGO.CardEffects.BT11
                 {
                     if (cardSource.IsTamer)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Blue))
+                        if (cardSource.HasCardColor(CardColor.Blue))
                         {
                             return true;
                         }

Assets/Scripts/CardEffect/BT11/Blue/BT11_024.cs

@@ -26,7 +26,7 @@ namespace DCGO.CardEffects.BT11
                 {
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Blue))
+                        if (cardSource.HasCardColor(CardColor.Blue))
                         {
                             if (cardSource.Level == 3)
                             {

Assets/Scripts/CardEffect/BT11/Blue/BT11_029.cs

@@ -28,7 +28,7 @@ namespace DCGO.CardEffects.BT11
                 {
                     if (cardSource.IsTamer)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Blue))
+                        if (cardSource.HasCardColor(CardColor.Blue))
                         {
                             return true;
                         }

Assets/Scripts/CardEffect/BT11/Blue/BT11_031.cs

@@ -121,7 +121,7 @@ namespace DCGO.CardEffects.BT11
                 {
                     if (cardSource != null)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Blue))
+                        if (cardSource.HasCardColor(CardColor.Blue))
                         {
                             if (cardSource.Owner == card.Owner)
                             {
@@ -140,7 +140,7 @@ namespace DCGO.CardEffects.BT11
                 {
                     if (cardSource != null)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Blue))
+                        if (cardSource.HasCardColor(CardColor.Blue))
                         {
                             if (cardSource.Owner == card.Owner)
                             {

Assets/Scripts/CardEffect/BT11/Blue/BT11_032.cs

@@ -25,7 +25,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    if (cardSource.CardColors.Contains(CardColor.Blue))
+                    if (cardSource.HasCardColor(CardColor.Blue))
                     {
                         if (cardSource.IsTamer)
                         {

Assets/Scripts/CardEffect/BT11/Blue/BT11_098.cs

@@ -45,7 +45,7 @@ namespace DCGO.CardEffects.BT11
                     {
                         if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
                         {
-                            if (cardSource.CardColors.Contains(CardColor.Blue))
+                            if (cardSource.HasCardColor(CardColor.Blue))
                             {
                                 return true;
                             }

Assets/Scripts/CardEffect/BT11/Green/BT11_054.cs

@@ -52,7 +52,7 @@ namespace DCGO.CardEffects.BT11
                     {
                         if (cardSource.GetCostItself <= 4)
                         {
-                            if (cardSource.CardColors.Contains(CardColor.Blue) || cardSource.CardColors.Contains(CardColor.Green))
+                            if (cardSource.HasCardColor(CardColor.Blue) || cardSource.HasCardColor(CardColor.Green))
                             {
                                 if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
                                 {

Assets/Scripts/CardEffect/BT11/Green/BT11_056.cs

@@ -113,7 +113,7 @@ namespace DCGO.CardEffects.BT11
                             {
                                 if (cardSource.HasPlayCost)
                                 {
-                                    if (cardSource.CardColors.Contains(CardColor.Green) || cardSource.CardColors.Contains(CardColor.Black))
+                                    if (cardSource.HasCardColor(CardColor.Green) || cardSource.HasCardColor(CardColor.Black))
                                     {
                                         return true;
                                     }

Assets/Scripts/CardEffect/BT11/Purple/BT11_085.cs

@@ -43,7 +43,7 @@ namespace DCGO.CardEffects.BT11
                 {
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Purple) || cardSource.CardColors.Contains(CardColor.Blue))
+                        if (cardSource.HasCardColor(CardColor.Purple) || cardSource.HasCardColor(CardColor.Blue))
                         {
                             if (cardSource.Level == 3)
                             {
@@ -185,7 +185,7 @@ namespace DCGO.CardEffects.BT11
                 {
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Purple) || cardSource.CardColors.Contains(CardColor.Blue))
+                        if (cardSource.HasCardColor(CardColor.Purple) || cardSource.HasCardColor(CardColor.Blue))
                         {
                             if (cardSource.Level == 3)
                             {

Assets/Scripts/CardEffect/BT11/Purple/BT11_086.cs

@@ -57,7 +57,7 @@ namespace DCGO.CardEffects.BT11
                             {
                                 if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
                                 {
-                                    if (cardSource.CardColors.Contains(CardColor.Purple))
+                                    if (cardSource.HasCardColor(CardColor.Purple))
                                     {
                                         return true;
                                     }
@@ -175,7 +175,7 @@ namespace DCGO.CardEffects.BT11
                             {
                                 if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
                                 {
-                                    if (cardSource.CardColors.Contains(CardColor.Purple))
+                                    if (cardSource.HasCardColor(CardColor.Purple))
                                     {
                                         return true;
                                     }

Assets/Scripts/CardEffect/BT11/Red/BT11_007.cs

@@ -25,7 +25,7 @@ namespace DCGO.CardEffects.BT11
                 {
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Red))
+                        if (cardSource.HasCardColor(CardColor.Red))
                         {
                             if (cardSource.CardTraits.Contains("Vaccine"))
                             {
@@ -41,7 +41,7 @@ namespace DCGO.CardEffects.BT11
                 {
                     if (cardSource.IsTamer)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Red))
+                        if (cardSource.HasCardColor(CardColor.Red))
                         {
                             return true;
                         }

Assets/Scripts/CardEffect/BT11/Red/BT11_011.cs

@@ -30,7 +30,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    if (cardSource.CardColors.Contains(CardColor.Red))
+                    if (cardSource.HasCardColor(CardColor.Red))
                     {
                         if (cardSource.IsTamer)
                         {

Assets/Scripts/CardEffect/BT11/Red/BT11_016.cs

@@ -175,7 +175,7 @@ namespace DCGO.CardEffects.BT11
                 {
                     if (cardSource.CardDP <= maxDP())
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Red))
+                        if (cardSource.HasCardColor(CardColor.Red))
                         {
                             if (cardSource.IsDigimon)
                             {

Assets/Scripts/CardEffect/BT11/Red/BT11_089.cs

@@ -23,7 +23,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    if (cardSource.CardColors.Contains(CardColor.Red))
+                    if (cardSource.HasCardColor(CardColor.Red))
                     {
                         if (cardSource.IsDigimon)
                         {

Assets/Scripts/CardEffect/BT12/Black/BT12_068.cs

@@ -42,7 +42,7 @@ namespace DCGO.CardEffects.BT12
                 {
                     if (cardSource.IsTamer)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Red) || cardSource.CardColors.Contains(CardColor.Black))
+                        if (cardSource.HasCardColor(CardColor.Red) || cardSource.HasCardColor(CardColor.Black))
                         {
                             if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
                             {

Assets/Scripts/CardEffect/BT12/Black/BT12_071.cs

@@ -31,7 +31,7 @@ namespace DCGO.CardEffects.BT12
                         {
                             if (cardSource.HasPlayCost)
                             {
-                                if (cardSource.CardColors.Contains(CardColor.Black))
+                                if (cardSource.HasCardColor(CardColor.Black))
                                 {
                                     return true;
                                 }
@@ -128,7 +128,7 @@ namespace DCGO.CardEffects.BT12
                 {
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Black))
+                        if (cardSource.HasCardColor(CardColor.Black))
                         {
                             if (cardSource.Level <= 4)
                             {

Assets/Scripts/CardEffect/BT12/Blue/BT12_022.cs

@@ -30,7 +30,7 @@ namespace DCGO.CardEffects.BT12
                         {
                             bool CardCondition(CardSource cardSource)
                             {
-                                if (cardSource.CardColors.Contains(CardColor.Green))
+                                if (cardSource.HasCardColor(CardColor.Green))
                                 {
                                     if (cardSource.IsDigimon)
                                     {

Assets/Scripts/CardEffect/BT12/Blue/BT12_024.cs

@@ -56,7 +56,7 @@ namespace DCGO.CardEffects.BT12
                         {
                             if (cardSource.Owner == card.Owner)
                             {
-                                if (cardSource.CardColors.Contains(CardColor.Blue))
+                                if (cardSource.HasCardColor(CardColor.Blue))
                                 {
                                     if (cardSource.Level == 3)
                                     {

Assets/Scripts/CardEffect/BT12/Blue/BT12_025.cs

@@ -72,7 +72,7 @@ namespace DCGO.CardEffects.BT12
                         {
                             if (cardSource.Owner == card.Owner)
                             {
-                                if (cardSource.CardColors.Contains(CardColor.Blue))
+                                if (cardSource.HasCardColor(CardColor.Blue))
                                 {
                                     if (cardSource.Level == 3)
                                     {

Assets/Scripts/CardEffect/BT12/Blue/BT12_026.cs

@@ -25,7 +25,7 @@ namespace DCGO.CardEffects.BT12
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    if (cardSource.CardColors.Contains(CardColor.Blue))
+                    if (cardSource.HasCardColor(CardColor.Blue))
                     {
                         if (cardSource.Level <= 5)
                         {

Assets/Scripts/CardEffect/BT12/Blue/BT12_030.cs

@@ -47,7 +47,7 @@ namespace DCGO.CardEffects.BT12
                 {
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
-                        if (card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) => cardSource.CardColors.Contains(CardColor.Blue)) >= 1)
+                        if (card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) => cardSource.HasCardColor(CardColor.Blue)) >= 1)
                         {
                             if (CardEffectCommons.CanUnsuspend(card.PermanentOfThisCard()))
                             {
@@ -55,7 +55,7 @@ namespace DCGO.CardEffects.BT12
                             }
                         }
 
-                        if (card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) => cardSource.CardColors.Contains(CardColor.Green)) >= 1)
+                        if (card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) => cardSource.HasCardColor(CardColor.Green)) >= 1)
                         {
                             if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                             {
@@ -71,14 +71,14 @@ namespace DCGO.CardEffects.BT12
                 {
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
-                        if (card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) => cardSource.CardColors.Contains(CardColor.Blue)) >= 1)
+                        if (card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) => cardSource.HasCardColor(CardColor.Blue)) >= 1)
                         {
                             Permanent selectedPermanent = card.PermanentOfThisCard();
 
                             yield return ContinuousController.instance.StartCoroutine(new IUnsuspendPermanents(new List<Permanent>() { selectedPermanent }, activateClass).Unsuspend());
                         }
 
-                        if (card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) => cardSource.CardColors.Contains(CardColor.Green)) >= 1)
+                        if (card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) => cardSource.HasCardColor(CardColor.Green)) >= 1)
                         {
                             if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                             {

Assets/Scripts/CardEffect/BT12/Blue/BT12_032.cs

@@ -43,7 +43,7 @@ namespace DCGO.CardEffects.BT12
                 {
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Blue))
+                        if (cardSource.HasCardColor(CardColor.Blue))
                         {
                             if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
                             {
@@ -184,7 +184,7 @@ namespace DCGO.CardEffects.BT12
                 {
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Blue))
+                        if (cardSource.HasCardColor(CardColor.Blue))
                         {
                             if (cardSource.Level <= 4)
                             {

Assets/Scripts/CardEffect/BT12/Blue/BT12_101.cs

@@ -50,7 +50,7 @@ namespace DCGO.CardEffects.BT12
                 {
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Blue))
+                        if (cardSource.HasCardColor(CardColor.Blue))
                         {
                             if (cardSource.Level <= 4)
                             {

Assets/Scripts/CardEffect/BT12/Green/BT12_045.cs

@@ -23,7 +23,7 @@ namespace DCGO.CardEffects.BT12
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    if (cardSource.CardColors.Contains(CardColor.Green))
+                    if (cardSource.HasCardColor(CardColor.Green))
                     {
                         if (cardSource.IsDigimon)
                         {

Assets/Scripts/CardEffect/BT12/Green/BT12_050.cs

@@ -30,7 +30,7 @@ namespace DCGO.CardEffects.BT12
                         {
                             bool CardCondition(CardSource cardSource)
                             {
-                                if (cardSource.CardColors.Contains(CardColor.Blue))
+                                if (cardSource.HasCardColor(CardColor.Blue))
                                 {
                                     if (cardSource.IsDigimon)
                                     {

Assets/Scripts/CardEffect/BT12/Green/BT12_105.cs

@@ -48,7 +48,7 @@ namespace DCGO.CardEffects.BT12
                         {
                             if (cardSource.Owner == card.Owner)
                             {
-                                if (cardSource.CardColors.Contains(CardColor.Green))
+                                if (cardSource.HasCardColor(CardColor.Green))
                                 {
                                     if (cardSource.Level <= 4)
                                     {

Assets/Scripts/CardEffect/BT12/Purple/BT12_080.cs

@@ -25,12 +25,12 @@ namespace DCGO.CardEffects.BT12
                 {
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Black))
+                        if (cardSource.HasCardColor(CardColor.Black))
                         {
                             return true;
                         }
 
-                        if (cardSource.CardColors.Contains(CardColor.Purple))
+                        if (cardSource.HasCardColor(CardColor.Purple))
                         {
                             return true;
                         }
@@ -93,12 +93,12 @@ namespace DCGO.CardEffects.BT12
                 {
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Black))
+                        if (cardSource.HasCardColor(CardColor.Black))
                         {
                             return true;
                         }
 
-                        if (cardSource.CardColors.Contains(CardColor.Purple))
+                        if (cardSource.HasCardColor(CardColor.Purple))
                         {
                             return true;
                         }

Assets/Scripts/CardEffect/BT12/Purple/BT12_081.cs

@@ -171,7 +171,7 @@ namespace DCGO.CardEffects.BT12
                         
                         if (GManager.instance.userSelectionManager.SelectedIntValue == 0)
                         {
-                            #region �Reduce Cost
+                            #region �Reduce Cost
 
                             ChangeCostClass changeCostClass = new ChangeCostClass();
                             changeCostClass.SetUpICardEffect("Digivolution Cost -3", CanUseCondition1, card);

Assets/Scripts/CardEffect/BT12/Red/BT12_017.cs

@@ -34,7 +34,7 @@ namespace DCGO.CardEffects.BT12
                     {
                         if (CardEffectCommons.IsExistOnBattleArea(card)
                         && card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) =>
-                        cardSource.IsTamer && cardSource.CardColors.Contains(CardColor.Red)) >= 1)
+                        cardSource.IsTamer && cardSource.HasCardColor(CardColor.Red)) >= 1)
                         {
                             if (permanent.DP <= card.PermanentOfThisCard().DP)
                             {

Assets/Scripts/CardEffect/BT12/Yellow/BT12_092.cs

@@ -101,7 +101,7 @@ namespace DCGO.CardEffects.BT12
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    return cardSource.HasGreymonName && cardSource.CardColors.Contains(CardColor.Yellow);
+                    return cardSource.HasGreymonName && cardSource.HasCardColor(CardColor.Yellow);
                 }
 
                 bool CanUseCondition(Hashtable hashtable)

Assets/Scripts/CardEffect/BT13/Black/BT13_061.cs

@@ -28,7 +28,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    return cardSource.CardColors.Contains(CardColor.Black);
+                    return cardSource.HasCardColor(CardColor.Black);
                 }
 
                 bool CanUseCondition(Hashtable hashtable)

Assets/Scripts/CardEffect/BT13/Blue/BT13_096.cs

@@ -42,7 +42,7 @@ namespace DCGO.CardEffects.BT13
                     {
                         if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
                         {
-                            if (cardSource.CardColors.Contains(CardColor.Blue))
+                            if (cardSource.HasCardColor(CardColor.Blue))
                             {
                                 if (cardSource.Level == 3)
                                 {
@@ -178,7 +178,7 @@ namespace DCGO.CardEffects.BT13
                 {
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Blue))
+                        if (cardSource.HasCardColor(CardColor.Blue))
                         {
                             if (cardSource.Level <= 4)
                             {

Assets/Scripts/CardEffect/BT13/Green/BT13_056.cs

@@ -35,7 +35,7 @@ namespace DCGO.CardEffects.BT13
                                 return true;
                             }
 
-                            if (cardSource.CardColors.Contains(CardColor.Green))
+                            if (cardSource.HasCardColor(CardColor.Green))
                             {
                                 return true;
                             }
@@ -62,7 +62,7 @@ namespace DCGO.CardEffects.BT13
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 {
-                    #region 登場コスト-4
+                    #region �ｽo�ｽ�ｽR�ｽX�ｽg-4
 
                     ChangeCostClass changeCostClass = new ChangeCostClass();
                     changeCostClass.SetUpICardEffect("Play Cost -4", CanUseCondition1, card);
@@ -131,7 +131,7 @@ namespace DCGO.CardEffects.BT13
                                         return true;
                                     }
 
-                                    if (cardSource.CardColors.Contains(CardColor.Green))
+                                    if (cardSource.HasCardColor(CardColor.Green))
                                     {
                                         return true;
                                     }
@@ -191,7 +191,7 @@ namespace DCGO.CardEffects.BT13
                         yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.PlayPermanentCards(cardSources: selectedCards, activateClass: activateClass, payCost: true, isTapped: false, root: SelectCardEffect.Root.Hand, activateETB: true));
                     }
 
-                    #region 登場コスト-4解除
+                    #region �ｽo�ｽ�ｽR�ｽX�ｽg-4�ｽ�ｽ�ｽ�ｽ
 
                     card.Owner.UntilCalculateFixedCostEffect.Remove(getCardEffect);
 
@@ -223,7 +223,7 @@ namespace DCGO.CardEffects.BT13
                                 return true;
                             }
 
-                            if (cardSource.CardColors.Contains(CardColor.Green))
+                            if (cardSource.HasCardColor(CardColor.Green))
                             {
                                 return true;
                             }
@@ -239,7 +239,7 @@ namespace DCGO.CardEffects.BT13
                     {
                         bool canPlay = false;
 
-                        #region 登場コスト-4
+                        #region �ｽo�ｽ�ｽR�ｽX�ｽg-4
 
                         ChangeCostClass changeCostClass = new ChangeCostClass();
                         changeCostClass.SetUpICardEffect("Play Cost -4", CanUseCondition1, card);
@@ -308,7 +308,7 @@ namespace DCGO.CardEffects.BT13
                                             return true;
                                         }
 
-                                        if (cardSource.CardColors.Contains(CardColor.Green))
+                                        if (cardSource.HasCardColor(CardColor.Green))
                                         {
                                             return true;
                                         }
@@ -336,7 +336,7 @@ namespace DCGO.CardEffects.BT13
                             canPlay = true;
                         }
 
-                        #region 登場コスト-4解除
+                        #region �ｽo�ｽ�ｽR�ｽX�ｽg-4�ｽ�ｽ�ｽ�ｽ
 
                         card.Owner.UntilCalculateFixedCostEffect.Remove(getCardEffect);
 
@@ -353,7 +353,7 @@ namespace DCGO.CardEffects.BT13
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 {
-                    #region 登場コスト-4
+                    #region �ｽo�ｽ�ｽR�ｽX�ｽg-4
 
                     ChangeCostClass changeCostClass = new ChangeCostClass();
                     changeCostClass.SetUpICardEffect("Play Cost -4", CanUseCondition1, card);
@@ -422,7 +422,7 @@ namespace DCGO.CardEffects.BT13
                                         return true;
                                     }
 
-                                    if (cardSource.CardColors.Contains(CardColor.Green))
+                                    if (cardSource.HasCardColor(CardColor.Green))
                                     {
                                         return true;
                                     }
@@ -482,7 +482,7 @@ namespace DCGO.CardEffects.BT13
                         yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.PlayPermanentCards(cardSources: selectedCards, activateClass: activateClass, payCost: true, isTapped: false, root: SelectCardEffect.Root.Hand, activateETB: true));
                     }
 
-                    #region 登場コスト-4解除
+                    #region �ｽo�ｽ�ｽR�ｽX�ｽg-4�ｽ�ｽ�ｽ�ｽ
 
                     card.Owner.UntilCalculateFixedCostEffect.Remove(getCardEffect);
 

Assets/Scripts/CardEffect/BT13/Purple/BT13_084.cs

@@ -235,7 +235,7 @@ namespace DCGO.CardEffects.BT13
                 {
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Purple))
+                        if (cardSource.HasCardColor(CardColor.Purple))
                         {
                             if (cardSource.Level <= 4)
                             {

Assets/Scripts/CardEffect/BT13/Purple/BT13_085.cs

@@ -81,7 +81,7 @@ namespace DCGO.CardEffects.BT13
                 {
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Purple))
+                        if (cardSource.HasCardColor(CardColor.Purple))
                         {
                             if (cardSource.Level <= 4)
                             {

Assets/Scripts/CardEffect/BT13/Red/BT13_012.cs

@@ -37,7 +37,7 @@ namespace DCGO.CardEffects.BT13
                 {
                     if (cardSource.IsTamer)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Red) || cardSource.CardColors.Contains(CardColor.Yellow))
+                        if (cardSource.HasCardColor(CardColor.Red) || cardSource.HasCardColor(CardColor.Yellow))
                         {
                             if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
                             {

Assets/Scripts/CardEffect/BT13/Red/BT13_014.cs

@@ -28,7 +28,7 @@ namespace DCGO.CardEffects.BT13
                     {
                         if (cardSource.HasPlayCost)
                         {
-                            if (cardSource.CardColors.Contains(CardColor.Red))
+                            if (cardSource.HasCardColor(CardColor.Red))
                             {
                                 if (cardSource.IsTamer)
                                 {
@@ -118,7 +118,7 @@ namespace DCGO.CardEffects.BT13
                     {
                         if (cardSource.HasPlayCost)
                         {
-                            if (cardSource.CardColors.Contains(CardColor.Red))
+                            if (cardSource.HasCardColor(CardColor.Red))
                             {
                                 if (cardSource.IsTamer)
                                 {

Assets/Scripts/CardEffect/BT13/Yellow/BT13_034.cs

@@ -28,7 +28,7 @@ namespace DCGO.CardEffects.BT13
                     {
                         if (cardSource.CardTraits.Contains("Vaccine"))
                         {
-                            if (cardSource.CardColors.Contains(CardColor.Yellow))
+                            if (cardSource.HasCardColor(CardColor.Yellow))
                             {
                                 return true;
                             }
@@ -42,7 +42,7 @@ namespace DCGO.CardEffects.BT13
                 {
                     if (cardSource.IsTamer)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Yellow))
+                        if (cardSource.HasCardColor(CardColor.Yellow))
                         {
                             return true;
                         }
@@ -106,7 +106,7 @@ namespace DCGO.CardEffects.BT13
 
                 string EffectDiscription()
                 {
-                    return "[When Attacking][Once per Turn] If there're 6 or fewer total cards in both players' security stacks, 1 of your opponent�f Digimon gets -2000 DP for the turn.";
+                    return "[When Attacking][Once per Turn] If there're 6 or fewer total cards in both players' security stacks, 1 of your opponent�f Digimon gets -2000 DP for the turn.";
                 }
 
                 bool CanSelectPermanentCondition(Permanent permanent)

Assets/Scripts/CardEffect/BT13/Yellow/BT13_044.cs

@@ -109,7 +109,7 @@ namespace DCGO.CardEffects.BT13
                 {
                     if (cardSource.IsTamer)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Yellow))
+                        if (cardSource.HasCardColor(CardColor.Yellow))
                         {
                             if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
                             {

Assets/Scripts/CardEffect/BT13/Yellow/BT13_046.cs

@@ -79,7 +79,7 @@ namespace DCGO.CardEffects.BT13
 
                         IEnumerator SelectCardCoroutine(CardSource cardSource)
                         {
-                            if (cardSource.CardColors.Contains(CardColor.Yellow))
+                            if (cardSource.HasCardColor(CardColor.Yellow))
                             {
                                 yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddSecurityCard(cardSource));
                             }
@@ -159,7 +159,7 @@ namespace DCGO.CardEffects.BT13
 
                         IEnumerator SelectCardCoroutine(CardSource cardSource)
                         {
-                            if (cardSource.CardColors.Contains(CardColor.Yellow))
+                            if (cardSource.HasCardColor(CardColor.Yellow))
                             {
                                 yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddSecurityCard(cardSource));
                             }

Assets/Scripts/CardEffect/BT14/Green/BT14_042.cs

@@ -23,7 +23,7 @@ namespace DCGO.CardEffects.BT14
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    return cardSource.CardColors.Contains(CardColor.Green);
+                    return cardSource.HasCardColor(CardColor.Green);
                 }
 
                 bool CanUseCondition(Hashtable hashtable)

Assets/Scripts/CardEffect/BT14/Green/BT14_046.cs

@@ -27,7 +27,7 @@ namespace DCGO.CardEffects.BT14
                 {
                     if (cardSource.IsTamer)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Green))
+                        if (cardSource.HasCardColor(CardColor.Green))
                         {
                             if (cardSource.Owner.HandCards.Contains(cardSource))
                             {
@@ -197,7 +197,7 @@ namespace DCGO.CardEffects.BT14
 
                     bool CardSourceCondition(CardSource cardSource)
                     {
-                        return cardSource.CardColors.Contains(CardColor.Green) && cardSource.IsTamer;
+                        return cardSource.HasCardColor(CardColor.Green) && cardSource.IsTamer;
                     }
 
                     bool RootCondition(SelectCardEffect.Root root)
@@ -307,7 +307,7 @@ namespace DCGO.CardEffects.BT14
                     {
                         if (cardSource.IsTamer)
                         {
-                            if (cardSource.CardColors.Contains(CardColor.Green))
+                            if (cardSource.HasCardColor(CardColor.Green))
                             {
                                 if (cardSource.Owner.HandCards.Contains(cardSource))
                                 {

Assets/Scripts/CardEffect/BT14/Green/BT14_051.cs

@@ -38,7 +38,7 @@ namespace DCGO.CardEffects.BT14
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    return cardSource.CardColors.Contains(CardColor.Green) && cardSource.IsDigimon;
+                    return cardSource.HasCardColor(CardColor.Green) && cardSource.IsDigimon;
                 }
 
                 bool CanUseCondition(Hashtable hashtable)

Assets/Scripts/CardEffect/BT14/Purple/BT14_072.cs

@@ -27,7 +27,7 @@ namespace DCGO.CardEffects.BT14
                 {
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Purple))
+                        if (cardSource.HasCardColor(CardColor.Purple))
                         {
                             if (cardSource.CardTraits.Contains("Dark Animal"))
                             {
@@ -137,7 +137,7 @@ namespace DCGO.CardEffects.BT14
                 {
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Purple))
+                        if (cardSource.HasCardColor(CardColor.Purple))
                         {
                             if (cardSource.CardTraits.Contains("Dark Animal"))
                             {

Assets/Scripts/CardEffect/BT14/White/BT14_088.cs

@@ -41,7 +41,7 @@ namespace DCGO.CardEffects.BT14
                 {
                     if (cardSource.IsTamer)
                     {
-                        if (!cardSource.CardColors.Contains(CardColor.White))
+                        if (!cardSource.HasCardColor(CardColor.White))
                         {
                             return true;
                         }

Assets/Scripts/CardEffect/BT14/Yellow/BT14_033.cs

@@ -27,7 +27,7 @@ namespace DCGO.CardEffects.BT14
                 {
                     if (cardSource.CardTraits.Contains("Vaccine"))
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Yellow))
+                        if (cardSource.HasCardColor(CardColor.Yellow))
                         {
                             if (cardSource.IsDigimon)
                             {
@@ -49,7 +49,7 @@ namespace DCGO.CardEffects.BT14
                 {
                     if (cardSource.CardTraits.Contains("Vaccine"))
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Yellow))
+                        if (cardSource.HasCardColor(CardColor.Yellow))
                         {
                             return true;
                         }

Assets/Scripts/CardEffect/BT14/Yellow/BT14_084.cs

@@ -26,7 +26,7 @@ namespace DCGO.CardEffects.BT14
                 {
                     if (cardSource.CardTraits.Contains("Vaccine"))
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Yellow))
+                        if (cardSource.HasCardColor(CardColor.Yellow))
                         {
                             return true;
                         }

Assets/Scripts/CardEffect/BT14/Yellow/BT14_093.cs

@@ -40,7 +40,7 @@ namespace DCGO.CardEffects.BT14
                 {
                     if (cardSource.CardTraits.Contains("Vaccine"))
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Yellow))
+                        if (cardSource.HasCardColor(CardColor.Yellow))
                         {
                             if (cardSource.Level <= 6)
                             {

Assets/Scripts/CardEffect/BT14/Yellow/BT14_102.cs

@@ -254,7 +254,7 @@ namespace DCGO.CardEffects.BT14
                 {
                     if (cardSource.CardTraits.Contains("Vaccine"))
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Yellow))
+                        if (cardSource.HasCardColor(CardColor.Yellow))
                         {
                             return true;
                         }

Assets/Scripts/CardEffect/BT15/Black/BT15_055.cs

@@ -28,7 +28,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanSelectCardCondition1(CardSource cardSource)
                 {
-                    return cardSource.IsTamer && cardSource.CardColors.Contains(CardColor.Black);
+                    return cardSource.IsTamer && cardSource.HasCardColor(CardColor.Black);
                 }
 
                 bool CanUseCondition(Hashtable hashtable)

Assets/Scripts/CardEffect/BT15/Black/BT15_060.cs

@@ -82,7 +82,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    return cardSource.IsDigimon && cardSource.HasLevel && cardSource.CardColors.Contains(CardColor.Black) && (cardSource.HasGreymonName || cardSource.HasGarurumonName);
+                    return cardSource.IsDigimon && cardSource.HasLevel && cardSource.HasCardColor(CardColor.Black) && (cardSource.HasGreymonName || cardSource.HasGarurumonName);
                 }
 
                 bool CanUseCondition(Hashtable hashtable)

Assets/Scripts/CardEffect/BT15/Black/BT15_066.cs

@@ -30,7 +30,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CardCondition(CardSource cardSource)
                 {
-                    return !cardSource.CardColors.Contains(CardColor.White);
+                    return !cardSource.HasCardColor(CardColor.White);
                 }
 
                 cardEffects.Add(CardEffectFactory.CanNotDigivolveStaticSelfEffect(

Assets/Scripts/CardEffect/BT15/Blue/BT15_028.cs

@@ -34,7 +34,7 @@ namespace DCGO.CardEffects.BT15
                     {
                         if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
                         {
-                            if (cardSource.CardColors.Contains(CardColor.Blue))
+                            if (cardSource.HasCardColor(CardColor.Blue))
                             {
                                 return true;
                             }

Assets/Scripts/CardEffect/BT15/Blue/BT15_031.cs

@@ -30,7 +30,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CardCondition(CardSource cardSource)
                 {
-                    return !cardSource.CardColors.Contains(CardColor.White);
+                    return !cardSource.HasCardColor(CardColor.White);
                 }
 
                 cardEffects.Add(CardEffectFactory.CanNotDigivolveStaticSelfEffect(

Assets/Scripts/CardEffect/BT15/Green/BT15_052.cs

@@ -30,7 +30,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CardCondition(CardSource cardSource)
                 {
-                    return !cardSource.CardColors.Contains(CardColor.White);
+                    return !cardSource.HasCardColor(CardColor.White);
                 }
 
                 cardEffects.Add(CardEffectFactory.CanNotDigivolveStaticSelfEffect(

Assets/Scripts/CardEffect/BT15/Purple/BT15_076.cs

@@ -39,7 +39,7 @@ namespace DCGO.CardEffects.BT15
                 {
                     if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Purple))
+                        if (cardSource.HasCardColor(CardColor.Purple))
                         {
                             if (cardSource.IsDigimon)
                             {
@@ -151,7 +151,7 @@ namespace DCGO.CardEffects.BT15
                 {
                     if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Purple))
+                        if (cardSource.HasCardColor(CardColor.Purple))
                         {
                             if (cardSource.IsDigimon)
                             {

Assets/Scripts/CardEffect/BT15/Purple/BT15_079.cs

@@ -30,7 +30,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CardCondition(CardSource cardSource)
                 {
-                    return !cardSource.CardColors.Contains(CardColor.White);
+                    return !cardSource.HasCardColor(CardColor.White);
                 }
 
                 cardEffects.Add(CardEffectFactory.CanNotDigivolveStaticSelfEffect(

Assets/Scripts/CardEffect/BT15/Purple/BT15_081.cs

@@ -120,7 +120,7 @@ namespace DCGO.CardEffects.BT15
 
                         if (cardSource.PermanentOfThisCard().DigivolutionCards.Count((CS) => CS.CardNames.Contains("X Antibody") || CS.CardNames.Contains("XAntibody")) >= 1)
                         {
-                            return cardSource.Level == 5 && cardSource.CardColors.Contains(CardColor.Purple);
+                            return cardSource.Level == 5 && cardSource.HasCardColor(CardColor.Purple);
                         }
                     }
 

Assets/Scripts/CardEffect/BT15/Red/BT15_007.cs

@@ -35,7 +35,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanSelectCardCondition1(CardSource cardSource)
                 {
-                    return cardSource.CardColors.Contains(CardColor.Red);
+                    return cardSource.HasCardColor(CardColor.Red);
                 }
 
                 bool CanUseCondition(Hashtable hashtable)

Assets/Scripts/CardEffect/BT15/Red/BT15_013.cs

@@ -27,7 +27,7 @@ namespace DCGO.CardEffects.BT15
                 {
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Red))
+                        if (cardSource.HasCardColor(CardColor.Red))
                         {
                             if (cardSource.HasAvianBeastAnimalTraits)
                                 return true;

Assets/Scripts/CardEffect/BT15/Red/BT15_014.cs

@@ -38,7 +38,7 @@ namespace DCGO.CardEffects.BT15
                             {
                                 if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
                                 {
-                                    if (cardSource.CardColors.Contains(CardColor.Red))
+                                    if (cardSource.HasCardColor(CardColor.Red))
                                     {
                                         return true;
                                     }
@@ -131,7 +131,7 @@ namespace DCGO.CardEffects.BT15
                             {
                                 if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
                                 {
-                                    if (cardSource.CardColors.Contains(CardColor.Red))
+                                    if (cardSource.HasCardColor(CardColor.Red))
                                     {
                                         return true;
                                     }

Assets/Scripts/CardEffect/BT15/Red/BT15_017.cs

@@ -189,7 +189,7 @@ namespace DCGO.CardEffects.BT15
                 {
                     if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Red))
+                        if (cardSource.HasCardColor(CardColor.Red))
                         {
                             if (cardSource.IsDigimon)
                             {

Assets/Scripts/CardEffect/BT15/Red/BT15_082.cs

@@ -31,7 +31,7 @@ namespace DCGO.CardEffects.BT15
                 {
                     if (cardSource.Owner == card.Owner)
                     {
-                        return cardSource.CardColors.Contains(CardColor.Red);
+                        return cardSource.HasCardColor(CardColor.Red);
                     }
 
                     return false;
@@ -65,7 +65,7 @@ namespace DCGO.CardEffects.BT15
                     int subAmount = card.Owner.Enemy.SecurityCards.Count * 2000;
                     int cardDP = 13000 - subAmount;
 
-                    if (cardSource.CardDP <= cardDP && cardSource.CardColors.Contains(CardColor.Red) && cardSource.Owner == card.Owner)
+                    if (cardSource.CardDP <= cardDP && cardSource.HasCardColor(CardColor.Red) && cardSource.Owner == card.Owner)
                     {
                         if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false,
                                 cardEffect: activateClass))

Assets/Scripts/CardEffect/BT15/Red/BT15_088.cs

@@ -27,7 +27,7 @@ namespace DCGO.CardEffects.BT15
                 {
                     if (cardSource.IsTamer)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Red))
+                        if (cardSource.HasCardColor(CardColor.Red))
                         {
                             if (cardSource.GetCostItself <= 4)
                             {
@@ -46,7 +46,7 @@ namespace DCGO.CardEffects.BT15
                 {
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Red))
+                        if (cardSource.HasCardColor(CardColor.Red))
                         {
                             return true;
                         }

Assets/Scripts/CardEffect/BT15/Yellow/BT15_034.cs

@@ -106,7 +106,7 @@ namespace DCGO.CardEffects.BT15
                     {
                         if (cardSource.ContainsTraits("Vaccine"))
                         {
-                            if (cardSource.CardColors.Contains(CardColor.Yellow))
+                            if (cardSource.HasCardColor(CardColor.Yellow))
                             {
                                 return true;
                             }

Assets/Scripts/CardEffect/BT15/Yellow/BT15_042.cs

@@ -52,7 +52,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    if (cardSource.CardColors.Contains(CardColor.Yellow))
+                    if (cardSource.HasCardColor(CardColor.Yellow))
                     {
                         return true;
                     }

Assets/Scripts/CardEffect/BT15/Yellow/BT15_092.cs

@@ -66,7 +66,7 @@ namespace DCGO.CardEffects.BT15
                 {
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Yellow) && cardSource.Level <= 4)
+                        if (cardSource.HasCardColor(CardColor.Yellow) && cardSource.Level <= 4)
                         {
                             if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
                             {

Assets/Scripts/CardEffect/BT16/Purple/BT16_072.cs

@@ -34,7 +34,7 @@ namespace DCGO.CardEffects.BT16
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    if (cardSource.CardColors.Contains(CardColor.Purple))
+                    if (cardSource.HasCardColor(CardColor.Purple))
                     {
                         return true;
                     }

Assets/Scripts/CardEffect/BT16/Purple/BT16_079.cs

@@ -68,12 +68,12 @@ namespace DCGO.CardEffects.BT16
                 {
                     if (CardEffectCommons.IsExistOnHand(cardSource))
                     {
-                        if (cardSource.Level <= 4 && cardSource.CardColors.Contains(CardColor.Yellow) && cardSource.IsDigimon)
+                        if (cardSource.Level <= 4 && cardSource.HasCardColor(CardColor.Yellow) && cardSource.IsDigimon)
                         {
                             return true;
                         }
 
-                        if (cardSource.Level <= 4 && cardSource.CardColors.Contains(CardColor.Green) && cardSource.IsDigimon)
+                        if (cardSource.Level <= 4 && cardSource.HasCardColor(CardColor.Green) && cardSource.IsDigimon)
                         {
                             return true;
                         }
@@ -86,12 +86,12 @@ namespace DCGO.CardEffects.BT16
                 {
                     if (CardEffectCommons.IsExistOnTrash(cardSource))
                     {
-                        if (cardSource.Level <= 4 && cardSource.CardColors.Contains(CardColor.Yellow) && cardSource.IsDigimon)
+                        if (cardSource.Level <= 4 && cardSource.HasCardColor(CardColor.Yellow) && cardSource.IsDigimon)
                         {
                             return true;
                         }
 
-                        if (cardSource.Level <= 4 && cardSource.CardColors.Contains(CardColor.Green) && cardSource.IsDigimon)
+                        if (cardSource.Level <= 4 && cardSource.HasCardColor(CardColor.Green) && cardSource.IsDigimon)
                         {
                             return true;
                         }
@@ -246,12 +246,12 @@ namespace DCGO.CardEffects.BT16
                 {
                     if (CardEffectCommons.IsExistOnHand(cardSource))
                     {
-                        if (cardSource.Level <= 4 && cardSource.CardColors.Contains(CardColor.Yellow) && cardSource.IsDigimon)
+                        if (cardSource.Level <= 4 && cardSource.HasCardColor(CardColor.Yellow) && cardSource.IsDigimon)
                         {
                             return true;
                         }
 
-                        if (cardSource.Level <= 4 && cardSource.CardColors.Contains(CardColor.Green) && cardSource.IsDigimon)
+                        if (cardSource.Level <= 4 && cardSource.HasCardColor(CardColor.Green) && cardSource.IsDigimon)
                         {
                             return true;
                         }
@@ -264,12 +264,12 @@ namespace DCGO.CardEffects.BT16
                 {
                     if (CardEffectCommons.IsExistOnTrash(cardSource))
                     {
-                        if (cardSource.Level <= 4 && cardSource.CardColors.Contains(CardColor.Yellow) && cardSource.IsDigimon)
+                        if (cardSource.Level <= 4 && cardSource.HasCardColor(CardColor.Yellow) && cardSource.IsDigimon)
                         {
                             return true;
                         }
 
-                        if (cardSource.Level <= 4 && cardSource.CardColors.Contains(CardColor.Green) && cardSource.IsDigimon)
+                        if (cardSource.Level <= 4 && cardSource.HasCardColor(CardColor.Green) && cardSource.IsDigimon)
                         {
                             return true;
                         }

Assets/Scripts/CardEffect/BT16/Red/BT16_011.cs

@@ -50,7 +50,7 @@ namespace DCGO.CardEffects.BT16
                 {
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Red))
+                        if (cardSource.HasCardColor(CardColor.Red))
                         {
                             return true;
                         }
@@ -183,7 +183,7 @@ namespace DCGO.CardEffects.BT16
                 {
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.CardColors.Contains(CardColor.Red))
+                        if (cardSource.HasCardColor(CardColor.Red))
                         {
                             return true;
                         }
@@ -371,7 +371,7 @@ namespace DCGO.CardEffects.BT16
                     {
                         if (cardSource.IsDigimon)
                         {
-                            if (cardSource.CardColors.Contains(CardColor.Red))
+                            if (cardSource.HasCardColor(CardColor.Red))
                             {
                                 return true;
                             }

Assets/Scripts/CardEffect/BT16/Red/BT16_015.cs

@@ -140,7 +140,7 @@ namespace DCGO.CardEffects.BT16
                     {
                         if (cardSource.HasDP && cardSource.CardDP <= 11000)
                         {
-                            if (cardSource.CardColors.Contains(CardColor.Red))
+                            if (cardSource.HasCardColor(CardColor.Red))
                             {
                                 if (cardSource.HasAvianBeastAnimalTraits)
                                 {

Assets/Scripts/CardEffect/BT16/Yellow/BT16_031.cs

@@ -81,7 +81,7 @@ namespace DCGO.CardEffects.BT16
 
                 bool CanSelectCardToReturnToHand(CardSource cardSource)
                 {
-                    if (cardSource.CardColors.Count == 2 && (cardSource.CardColors.Contains(CardColor.Red) || cardSource.CardColors.Contains(CardColor.Purple)))
+                    if (cardSource.CardColors.Count == 2 && (cardSource.HasCardColor(CardColor.Red) || cardSource.HasCardColor(CardColor.Purple)))
                     {
                         if (cardSource.HasLevel && cardSource.Level <= 6)
                         {
@@ -203,7 +203,7 @@ namespace DCGO.CardEffects.BT16
 
                 bool CanSelectCardToReturnToHand(CardSource cardSource)
                 {
-                    if (cardSource.CardColors.Count == 2 && (cardSource.CardColors.Contains(CardColor.Red) || cardSource.CardColors.Contains(CardColor.Purple)))
+                    if (cardSource.CardColors.Count == 2 && (cardSource.HasCardColor(CardColor.Red) || cardSource.HasCardColor(CardColor.Purple)))
                     {
                         if (cardSource.HasLevel && cardSource.Level <= 6)
                         {

Assets/Scripts/CardEffect/BT16/Yellow/BT16_094.cs

@@ -27,7 +27,7 @@ namespace DCGO.CardEffects.BT16
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    if (cardSource.CardColors.Contains(CardColor.Yellow) || cardSource.EqualsTraits("Four Great Dragons"))
+                    if (cardSource.HasCardColor(CardColor.Yellow) || cardSource.EqualsTraits("Four Great Dragons"))
                     {
                         return true;
                     }
@@ -87,7 +87,7 @@ namespace DCGO.CardEffects.BT16
 
                 string EffectDiscription()
                 {
-                    return "[Main] <Delay>\r\n• Place 1 [Trial of the Four Great Dragons] from your hand in the battle area, or you may trash 1 card with the [Four Great Dragons] trait in your hand. If you did either, 1 of your opponent's Digimon gets -7000 DP for the turn.";
+                    return "[Main] <Delay>\r\n� Place 1 [Trial of the Four Great Dragons] from your hand in the battle area, or you may trash 1 card with the [Four Great Dragons] trait in your hand. If you did either, 1 of your opponent's Digimon gets -7000 DP for the turn.";
                 }
 
                 bool CanUseCondition(Hashtable hashtable)

Assets/Scripts/CardEffect/BT17/Black/BT17_056.cs

@@ -30,7 +30,7 @@ namespace DCGO.CardEffects.BT17
 
                     if (source.IsDigimon)
                     {
-                        if (source.CardColors.Contains(CardColor.Black))
+                        if (source.HasCardColor(CardColor.Black))
                         {
                             if (source.HasLevel && source.Level <= 5)
                                 return true;

Assets/Scripts/CardEffect/BT17/Black/BT17_058.cs

@@ -22,7 +22,7 @@ namespace DCGO.CardEffects.BT17
             {
                 if (source.IsDigimon)
                 {
-                    if (source.CardColors.Contains(CardColor.Black))
+                    if (source.HasCardColor(CardColor.Black))
                     {
                         if (source.HasLevel && source.Level <= 5)
                             return true;

Assets/Scripts/CardEffect/BT17/Blue/BT17_021.cs

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

Assets/Scripts/CardEffect/BT17/Blue/BT17_024.cs

@@ -22,7 +22,7 @@ namespace DCGO.CardEffects.BT17
             {
                 return cardSource.IsDigimon &&
                        cardSource.IsLevel3 &&
-                       cardSource.CardColors.Contains(CardColor.Blue);
+                       cardSource.HasCardColor(CardColor.Blue);
             }
 
             #endregion

Assets/Scripts/CardEffect/BT17/Blue/BT17_025.cs

@@ -54,7 +54,7 @@ namespace DCGO.CardEffects.BT17
                     return CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass) &&
                            cardSource.IsDigimon &&
                            cardSource.IsLevel3 &&
-                           (cardSource.CardColors.Contains(CardColor.Blue) || cardSource.CardColors.Contains(CardColor.Purple));
+                           (cardSource.HasCardColor(CardColor.Blue) || cardSource.HasCardColor(CardColor.Purple));
                 }
 
                 bool CanSelectPermanentCondition(Permanent permanent)

Assets/Scripts/CardEffect/BT17/Green/BT17_049.cs

@@ -48,7 +48,7 @@ namespace DCGO.CardEffects.BT17
                     {
                         if(source.HasLevel && source.Level == 3)
                         {
-                            if(source.CardColors.Contains(CardColor.Green) || source.CardColors.Contains(CardColor.Yellow))
+                            if(source.HasCardColor(CardColor.Green) || source.HasCardColor(CardColor.Yellow))
                             {
                                 if (CardEffectCommons.CanPlayAsNewPermanent(source, false, activateClass))
                                 {

Assets/Scripts/CardEffect/BT17/Purple/BT17_066.cs

@@ -60,7 +60,7 @@ namespace DCGO.CardEffects.BT17
                     return CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass) &&
                            cardSource.IsDigimon &&
                            cardSource.IsLevel3 &&
-                           (cardSource.CardColors.Contains(CardColor.Purple) || cardSource.CardColors.Contains(CardColor.Yellow));
+                           (cardSource.HasCardColor(CardColor.Purple) || cardSource.HasCardColor(CardColor.Yellow));
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)