Browse Source

BT22 fixes

mbunch_kascope 1 year ago
parent
commit
497e7ed110

+ 1 - 1
Assets/CardEffect/BT14/Red/BT14_017.cs

@@ -40,7 +40,7 @@ namespace DCGO.CardEffects.BT14
                     {
                         if (!CardEffectCommons.IsExistOnBreedingAreaDigimon(card))
                         {
-                            if (!cardSource.IsDigiEgg && cardSource.CardDP <= 6000)
+                            if (cardSource.CardDP <= 6000)
                             {
                                 return true;
                             }

+ 1 - 1
Assets/CardEffect/BT20/Red/BT20_020.cs

@@ -80,7 +80,7 @@ namespace DCGO.CardEffects.BT20
 
                     bool CardCondition(CardSource cardSource)
                     {
-                        return cardSource.IsDigimon || cardSource.IsTamer;
+                        return cardSource.IsDigimon || cardSource.IsTamer || cardSource.IsDigiEgg;
                     }
 
                     bool CardEffectCondition(ICardEffect cardEffect)

+ 2 - 2
Assets/CardEffect/BT22/Blue/BT22_021.cs

@@ -19,10 +19,10 @@ namespace DCGO.CardEffects.BT22
                 {
                     return source.IsDigimon
                     && source.HasLevel && source.IsLevel3
-                    && (source.HasSeaAnimalTraits || source.HasAquaTraits);
+                    && (source.ContainsTraits("Sea Animal") || source.ContainsTraits("Aqua"));
                 }
 
-                string[] decodeStrings = { "(Lv.3 w/[Aqua]/[Sea Animal] trait)", "Level 3 Digimon card with [Aqua] or [Sea Animal] " };
+                string[] decodeStrings = { "(Lv.3 w/[Aqua]/[Sea Animal] trait)", "Level 3 Digimon card with [Aqua] or [Sea Animal]" };
                 cardEffects.Add(CardEffectFactory.DecodeSelfEffect(card: card, isInheritedEffect: false, decodeStrings: decodeStrings, sourceCondition: SourceCondition, condition: null));
             }
 

+ 3 - 1
Assets/CardEffect/BT22/Purple/BT22_070.cs

@@ -16,7 +16,9 @@ namespace DCGO.CardEffects.BT22
             {
                 bool PermanentCondition(Permanent permanent)
                 {
-                    return permanent.TopCard.ContainsCardName("Tyrannomon") && !permanent.TopCard.HasXAntibodyTraits;
+                    return permanent.TopCard.IsLevel4 &&
+                           permanent.TopCard.ContainsCardName("Tyrannomon") && 
+                           !permanent.TopCard.HasXAntibodyTraits;
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(PermanentCondition, 0, false, card, null));

+ 1 - 1
Assets/CardEffect/BT22/Yellow/BT22_039.cs

@@ -23,7 +23,7 @@ namespace DCGO.CardEffects.BT22
                     return targetPermanent.TopCard.HasUltimateAppTraits;
                 }
 
-                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 5, ignoreDigivolutionRequirement: false, card: card, condition: null));
+                cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 4, ignoreDigivolutionRequirement: false, card: card, condition: null));
             }
 
             #endregion

+ 1 - 1
Assets/CardEffect/BT8/Red/BT8_097.cs

@@ -135,7 +135,7 @@ public class BT8_097 : CEntity_Effect
 
                 bool CardCondition(CardSource cardSource)
                 {
-                    return cardSource.IsDigimon;
+                    return cardSource.IsDigimon || cardSource.IsDigiEgg;
                 }
 
                 bool CardEffectCondition(ICardEffect cardEffect)

+ 1 - 1
Assets/CardEffect/BT9/Yellow/BT9_033.cs

@@ -31,7 +31,7 @@ public class BT9_033 : CEntity_Effect
 
             bool CardCondition(CardSource cardSource)
             {
-                return cardSource.IsDigimon;
+                return cardSource.IsDigimon || cardSource.IsDigiEgg;
             }
 
             bool CardEffectCondition(ICardEffect cardEffect)

+ 1 - 1
Assets/CardEffect/EX3/Red/EX3_012.cs

@@ -62,7 +62,7 @@ namespace DCGO.CardEffects.EX3
 
                         bool CardCondition(CardSource cardSource)
                         {
-                            if (cardSource.IsDigimon)
+                            if (cardSource.IsDigimon || cardSource.IsDigiEgg)
                             {
                                 if (cardSource.CardDP <= 5000)
                                 {

+ 8 - 18
Assets/CardEffect/EX9/Purple/EX9_065.cs

@@ -129,15 +129,10 @@ namespace DCGO.CardEffects.EX9
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    if (cardSource.HasLevel && cardSource.Level <= 4 && cardSource.EqualsTraits("DM"))
-                    {
-                        if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
-                        {
-                            return true;
-                        }
-                    }
-
-                    return false;
+                    return cardSource.IsDigimon &&
+                           cardSource.HasLevel && cardSource.Level <= 4 &&
+                           cardSource.EqualsTraits("DM") &&
+                           CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
@@ -208,15 +203,10 @@ namespace DCGO.CardEffects.EX9
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    if (cardSource.HasLevel && cardSource.Level <= 4 && cardSource.EqualsTraits("DM"))
-                    {
-                        if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
-                        {
-                            return true;
-                        }
-                    }
-
-                    return false;
+                    return cardSource.IsDigimon &&
+                           cardSource.HasLevel && cardSource.Level <= 4 &&
+                           cardSource.EqualsTraits("DM") &&
+                           CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

+ 2 - 2
Assets/CardEffect/ST20/White/ST20_15.cs

@@ -43,8 +43,8 @@ namespace DCGO.CardEffects.ST20
 
                 bool PermanentCondition(Permanent permanent)
                 {
-                    return CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card)
-                        && permanent.Level >= 3;
+                    return CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card) &&
+                           permanent.TopCard.HasLevel && permanent.Level >= 3;
                 }
 
                 string EffectDescription()