Browse Source

Whamon and Justimon X

Ensure that Whamon is properly checking either the black and purple DNA sources for being level 4

Justimon X will check for Justimon in the source's name rather than the exact name "Justimon"
Joe Delia 1 year ago
parent
commit
9d462775a5

+ 2 - 2
Assets/CardEffect/EX8/Black/JustimonXAntibody_EX8_054.cs

@@ -70,7 +70,7 @@ namespace DCGO.CardEffects.EX8
                         List<ICardEffect> candidateEffects = card.PermanentOfThisCard().EffectList(EffectTiming.OnEnterFieldAnyone)
                             .Clone()
                             .Filter(cardEffect => cardEffect != null && cardEffect is ActivateICardEffect && !cardEffect.IsSecurityEffect && cardEffect.IsWhenDigivolving)
-                            .Filter(cardEffect => cardEffect.EffectSourceCard.EqualsCardName("Justimon"));
+                            .Filter(cardEffect => cardEffect.EffectSourceCard.ContainsCardName("Justimon") && !cardEffect.EffectSourceCard.EqualsTraits("X Antibody"));
 
                         if (candidateEffects.Count >= 1)
                         {
@@ -88,7 +88,7 @@ namespace DCGO.CardEffects.EX8
                         List<ICardEffect> candidateEffects = card.PermanentOfThisCard().EffectList(EffectTiming.OnEnterFieldAnyone)
                             .Clone()
                             .Filter(cardEffect => cardEffect != null && cardEffect is ActivateICardEffect && !cardEffect.IsSecurityEffect && cardEffect.IsWhenDigivolving)
-                            .Filter(cardEffect => cardEffect.EffectSourceCard.EqualsCardName("Justimon")); ;
+                            .Filter(cardEffect => cardEffect.EffectSourceCard.ContainsCardName("Justimon") && !cardEffect.EffectSourceCard.EqualsTraits("X Antibody"));
 
                         if (candidateEffects.Count >= 1)
                         {

+ 5 - 3
Assets/CardEffect/EX8/Blue/Whamon_EX8_025.cs

@@ -44,10 +44,12 @@ namespace DCGO.CardEffects.EX8
                 {
                     if (cardSource == card)
                     {
-                        bool PermanentCondition1(Permanent permanent) => permanent.TopCard.CardColors.Contains(CardColor.Blue) && permanent.Levels_ForJogress(card).Contains(4);
+                        bool PermanentCondition1(Permanent permanent) =>
+                            permanent.TopCard.CardColors.Contains(CardColor.Blue) && permanent.Levels_ForJogress(card).Contains(4);
 
-                        bool PermanentCondition2(Permanent permanent) => permanent.TopCard.CardColors.Contains(CardColor.Black) && permanent.Levels_ForJogress(card).Contains(4) || permanent.TopCard.CardColors.Contains(CardColor.Purple) &&
-                                                                         permanent.Levels_ForJogress(card).Contains(4);
+                        bool PermanentCondition2(Permanent permanent) =>
+                            (permanent.TopCard.CardColors.Contains(CardColor.Black) && permanent.Levels_ForJogress(card).Contains(4)) || 
+                            (permanent.TopCard.CardColors.Contains(CardColor.Purple) && permanent.Levels_ForJogress(card).Contains(4));
 
                         JogressConditionElement[] elements = new JogressConditionElement[]
                         {