update yellow PR, updated HasAppmon and HasHeroTraits

Assets/CardEffect/BT21/Yellow/BT21_040.cs

@@ -15,7 +15,7 @@ namespace DCGO.CardEffects.BT21
             {
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return (targetPermanent.TopCard.EqualsCardName("Koromon") || targetPermanent.TopCard.EqualsTraits("Hero")) && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 2;
+                    return (targetPermanent.TopCard.EqualsCardName("Koromon") || (targetPermanent.TopCard.HasHeroTraits) && targetPermanent.TopCard.IsLevel2);
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 0, ignoreDigivolutionRequirement: false, card: card, condition: null));
@@ -34,7 +34,7 @@ namespace DCGO.CardEffects.BT21
                             return true;
                         }
 
-                        if (card.Owner.GetBattleAreaPermanents().Count((permanent) => permanent.IsTamer && permanent.TopCard.ContainsTraits("Hero")) >= 3)
+                        if (card.Owner.GetBattleAreaPermanents().Count((permanent) => permanent.IsTamer && permanent.TopCard.HasHeroTraits) >= 3)
                         {
                             if (card.Owner.LibraryCards.Count >= 1)
                             {

Assets/CardEffect/BT21/Yellow/BT21_041.cs

@@ -9,10 +9,22 @@ namespace DCGO.CardEffects.BT21
         {
             List<ICardEffect> cardEffects = new List<ICardEffect>();
 
+            #region Link Condition
+            if (timing == EffectTiming.None)
+            {
+                static bool PermanentCondition(Permanent targetPermanent)
+                {
+                    return targetPermanent.TopCard.HasAppmonTraits;
+                }
+
+                cardEffects.Add(CardEffectFactory.AddSelfLinkConditionStaticEffect(permanentCondition: PermanentCondition, linkCost: 1, card: card));
+            }
+            #endregion
+
             #region Link
             if (timing == EffectTiming.OnDeclaration)
             {
-                cardEffects.Add(CardEffectFactory.LinkEffect(card, 1, 2000));
+                cardEffects.Add(CardEffectFactory.LinkEffect(card));
             }
             #endregion
 
@@ -21,7 +33,7 @@ namespace DCGO.CardEffects.BT21
             {
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return (targetPermanent.TopCard.ContainsTraits("Appmon")) && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 2;
+                    return (targetPermanent.TopCard.HasAppmonTraits) && targetPermanent.TopCard.IsLevel2;
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 0, ignoreDigivolutionRequirement: false, card: card, condition: null));

Assets/CardEffect/BT21/Yellow/BT21_042.cs

@@ -43,7 +43,7 @@ namespace DCGO.CardEffects.BT21
 
                 bool PlayedPermanentCondition(Permanent permanent)
                 {
-                    return CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card) && permanent.IsTamer && permanent.TopCard.ContainsCardName("Marcus Damon");
+                    return CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card) && permanent.IsTamer && permanent.TopCard.EqualsCardName("Marcus Damon");
                 }
 
                 bool CanSelectCardToDigivolveInto(CardSource cardSource)

Assets/CardEffect/BT21/Yellow/BT21_043.cs

@@ -10,10 +10,22 @@ namespace DCGO.CardEffects.BT21
         {
             List<ICardEffect> cardEffects = new List<ICardEffect>();
 
+            #region Link Condition
+            if (timing == EffectTiming.None)
+            {
+                static bool PermanentCondition(Permanent targetPermanent)
+                {
+                    return targetPermanent.TopCard.HasAppmonTraits;
+                }
+
+                cardEffects.Add(CardEffectFactory.AddSelfLinkConditionStaticEffect(permanentCondition: PermanentCondition, linkCost: 2, card: card));
+            }
+            #endregion
+
             #region Link
             if (timing == EffectTiming.OnDeclaration)
             {
-                cardEffects.Add(CardEffectFactory.LinkEffect(card, 2, 3000));
+                cardEffects.Add(CardEffectFactory.LinkEffect(card));
             }
             #endregion
 

Assets/Scripts/CardSource.cs

@@ -2838,11 +2838,7 @@ public class CardSource : MonoBehaviour
     {
         get
         {
-            if (CardTraits.Contains("Hero"))
-            {
-                return true;
-            }
-            return false;
+            return EqualsTraits("Hero");
         }
     }
 
@@ -2922,12 +2918,7 @@ public class CardSource : MonoBehaviour
     {
         get
         {
-            if (CardTraits.Find(x => x.Equals("Appmon")) != null)
-            {
-                return true;
-            }
-
-            return false;
+            return EqualsTraits("Appmon");
         }
     }