Ver Fonte

1.4.3 update

mbunch_kascope há 1 ano atrás
pai
commit
000218ae2d

+ 2 - 2
Assets/CardBaseEntity/EX7/Purple/Digimon/LadyDevimon_(X_Antibody)-EX7-058.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d43b7ae82dab4475bcde653525bba1688fd09ca3f59a0ba28bf5fe96be2d1d2a
-size 1670
+oid sha256:a5b357ae04d120510ac7780b955c2799fb4e0de43dafb52781593f8c19fc2dc5
+size 1685

+ 21 - 1
Assets/CardEffect/EX7/Blue/CrysPaledramon_EX7_021.cs

@@ -102,10 +102,30 @@ namespace DCGO.CardEffects.EX7
                     return false;
                 }
 
-                cardEffects.Add(CardEffectFactory.PierceSelfEffect(isInheritedEffect: true, card: card, condition: Condition));
                 cardEffects.Add(CardEffectFactory.ChangeSelfSAttackStaticEffect(changeValue: 1, isInheritedEffect: true, card: card, condition: Condition));
             }
 
+            if (timing == EffectTiming.OnDetermineDoSecurityCheck)
+            {
+                bool Condition()
+                {
+                    if (CardEffectCommons.IsExistOnBattleArea(card))
+                    {
+                        if (CardEffectCommons.IsOwnerTurn(card))
+                        {
+                            if (!CardEffectCommons.HasMatchConditionOpponentsPermanent(card, (permanent) => permanent.IsDigimon && !permanent.HasNoDigivolutionCards))
+                            {
+                                if (card.PermanentOfThisCard().TopCard.EqualsTraits("Ice-Snow"))
+                                    return true;
+                            }
+                        }
+                    }
+
+                    return false;
+                }
+
+                cardEffects.Add(CardEffectFactory.PierceSelfEffect(isInheritedEffect: true, card: card, condition: Condition));
+            }
             #endregion
 
             return cardEffects;

+ 2 - 2
Assets/CardEffect/EX7/Purple/HeavyMetaldramon_EX7_062.cs

@@ -40,7 +40,7 @@ namespace DCGO.CardEffects.EX7
 
                 string EffectDiscription()
                 {
-                    return "[When Digivolving] Trash2 cards in your hand. Then, delete1 of your opponent's Digimon with as much or less DP as this Digimon.";
+                    return "[When Digivolving] Trash 2 cards in your hand. Then, delete 1 of your opponent's Digimon with as much or less DP as this Digimon.";
                 }
 
                 bool CanUseCondition(Hashtable hashtable)
@@ -165,7 +165,7 @@ namespace DCGO.CardEffects.EX7
 
                     if (cardSource.IsDigimon)
                     {
-                        if (cardSource.CardTraits.Contains("Evil") || cardSource.CardTraits.Contains("Dark Dragon") || cardSource.CardTraits.Contains("Evil Dragon"))
+                        if (cardSource.EqualsTraits("Evil") || cardSource.EqualsTraits("Dark Dragon") || cardSource.EqualsTraits("Evil Dragon"))
                         {
                             if (cardSource.GetCostItself <= maxCost)
                             {

+ 49 - 81
Assets/CardEffect/EX7/Purple/LadyDevimonXAntibody_EX7_058.cs

@@ -23,6 +23,26 @@ namespace DCGO.CardEffects.EX7
             }
             #endregion
 
+            #region Shared On Play/When Digivolving
+            bool CanSelectPermanentCondition(Permanent permanent)
+            {
+                return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card);
+            }
+
+            bool CanActivateSecondEffectCondition(Hashtable hashtable)
+            {
+                if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
+                {
+                    if (card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) => cardSource.CardNames.Contains("LadyDevimon") || cardSource.CardNames.Contains("X Antibody") || cardSource.CardNames.Contains("XAntibody")) >= 1)
+                    {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+            #endregion
+
             #region On Play
             if (timing == EffectTiming.OnEnterFieldAnyone)
             {
@@ -36,11 +56,6 @@ namespace DCGO.CardEffects.EX7
                     return "[On Play] 1 of your opponent's Digimon gains \"[End of Attack] Delete this Digimon.\" until the end of their turn. Then, if this Digimon has [LadyDevimon]/[X Antibody] in its digivolution cards, you may play 1 [Volée & Zerdrücken] Token (Digimon/Lv.4/Purple/5000 DP/<Blocker>/<Retaliation>).";
                 }
 
-                bool CanSelectPermanentCondition(Permanent permanent)
-                {
-                    return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card);
-                }
-
                 bool CanUseCondition(Hashtable hashtable)
                 {
                     if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
@@ -54,22 +69,6 @@ namespace DCGO.CardEffects.EX7
                     return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
-                bool CanActivateSecondEffectCondition(Hashtable hashtable)
-                {
-                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
-                    {
-                        if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
-                        {
-                            if (card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) => cardSource.CardNames.Contains("LadyDevimon") || cardSource.CardNames.Contains("X Antibody") || cardSource.CardNames.Contains("XAntibody")) >= 1)
-                            {
-                                return true;
-                            }
-                        }
-                    }
-
-                    return false;
-                }
-
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
                     if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
@@ -99,50 +98,44 @@ namespace DCGO.CardEffects.EX7
 
                         IEnumerator SelectPermanentCoroutine(Permanent permanent)
                         {
-                            Permanent selectedPermanent = permanent;
-
-                            if (selectedPermanent != null)
-                            {
-                                yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(selectedPermanent));
-                            }
-
-                            if (selectedPermanent != null)
+                            if (permanent != null)
                             {
+                                yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(permanent));
                                 ActivateClass activateClass1 = new ActivateClass();
-                                activateClass1.SetUpICardEffect("Delete this Digimon", CanUseCondition1, selectedPermanent.TopCard);
+                                activateClass1.SetUpICardEffect("Delete this Digimon", CanUseCondition1, permanent.TopCard);
                                 activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
-                                activateClass1.SetEffectSourcePermanent(selectedPermanent);
-                                selectedPermanent.UntilOwnerTurnEndEffects.Add(GetCardEffect);
+                                activateClass1.SetEffectSourcePermanent(permanent);
+                                permanent.UntilOwnerTurnEndEffects.Add(GetCardEffect);
 
                                 if (!permanent.TopCard.CanNotBeAffected(activateClass))
                                 {
-                                    yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(selectedPermanent));
+                                    yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(permanent));
                                 }
 
                                 string EffectDiscription1()
                                 {
-                                    return "[End of Your Turn] Delete this Digimon.";
+                                    return "[End of Attack] Delete this Digimon.";
                                 }
 
                                 bool CanUseCondition1(Hashtable hashtable1)
                                 {
-                                    if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                    if (CardEffectCommons.IsOpponentTurn(card))
                                     {
-                                        if (selectedPermanent.TopCard.Owner.GetBattleAreaDigimons().Contains(selectedPermanent))
+                                        if (CardEffectCommons.IsPermanentExistsOnOwnerBattleArea(permanent, permanent.TopCard))
                                         {
-                                            if (GManager.instance.turnStateMachine.gameContext.TurnPlayer == selectedPermanent.TopCard.Owner)
+                                            if (CardEffectCommons.CanTriggerOnEndAttack(hashtable1, permanent.TopCard))
                                             {
                                                 return true;
                                             }
                                         }
-                                    }
+                                    }                                    
 
                                     return false;
                                 }
 
                                 bool CanActivateCondition1(Hashtable hashtable1)
                                 {
-                                    if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                    if (CardEffectCommons.IsPermanentExistsOnBattleArea(permanent))
                                     {
                                         if (!permanent.TopCard.CanNotBeAffected(activateClass))
                                         {
@@ -155,10 +148,10 @@ namespace DCGO.CardEffects.EX7
 
                                 IEnumerator ActivateCoroutine1(Hashtable _hashtable1)
                                 {
-                                    if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                    if (CardEffectCommons.IsPermanentExistsOnBattleArea(permanent))
                                     {
                                         yield return ContinuousController.instance.StartCoroutine(new DestroyPermanentsClass(
-                                        new List<Permanent>() { selectedPermanent },
+                                        new List<Permanent>() { permanent },
                                         CardEffectCommons.CardEffectHashtable(activateClass1)).Destroy());
                                     }
                                 }
@@ -172,6 +165,7 @@ namespace DCGO.CardEffects.EX7
 
                                     return null;
                                 }
+
                             }
                         }
                     }
@@ -197,11 +191,6 @@ namespace DCGO.CardEffects.EX7
                     return "[When Digivolving] 1 of your opponent's Digimon gains \" Delete this Digimon.\" until the end of their turn. Then, if this Digimon has [LadyDevimon]/[X Antibody] in its digivolution cards, you may play 1 [Volée & Zerdrücken] Token (Digimon/Lv.4/Purple/5000 DP/<Blocker>/<Retaliation>).";
                 }
 
-                bool CanSelectPermanentCondition(Permanent permanent)
-                {
-                    return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card);
-                }
-
                 bool CanUseCondition(Hashtable hashtable)
                 {
                     if(CardEffectCommons.IsExistOnBattleAreaDigimon(card))
@@ -215,22 +204,6 @@ namespace DCGO.CardEffects.EX7
                     return CardEffectCommons.IsExistOnBattleAreaDigimon(card);
                 }
 
-                bool CanActivateSecondEffectCondition(Hashtable hashtable)
-                {
-                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
-                    {
-                        if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
-                        {
-                            if (card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) => cardSource.CardNames.Contains("LadyDevimon") || cardSource.CardNames.Contains("X Antibody") || cardSource.CardNames.Contains("XAntibody")) >= 1)
-                            {
-                                return true;
-                            }
-                        }
-                    }
-
-                    return false;
-                }
-
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
                     if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
@@ -260,38 +233,32 @@ namespace DCGO.CardEffects.EX7
 
                         IEnumerator SelectPermanentCoroutine(Permanent permanent)
                         {
-                            Permanent selectedPermanent = permanent;
-
-                            if (selectedPermanent != null)
-                            {
-                                yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(selectedPermanent));
-                            }
-
-                            if (selectedPermanent != null)
+                            if (permanent != null)
                             {
+                                yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(permanent));
                                 ActivateClass activateClass1 = new ActivateClass();
-                                activateClass1.SetUpICardEffect("Delete this Digimon", CanUseCondition1, selectedPermanent.TopCard);
+                                activateClass1.SetUpICardEffect("Delete this Digimon", CanUseCondition1, permanent.TopCard);
                                 activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
-                                activateClass1.SetEffectSourcePermanent(selectedPermanent);
-                                selectedPermanent.UntilOwnerTurnEndEffects.Add(GetCardEffect);
+                                activateClass1.SetEffectSourcePermanent(permanent);
+                                permanent.UntilOwnerTurnEndEffects.Add(GetCardEffect);
 
                                 if (!permanent.TopCard.CanNotBeAffected(activateClass))
                                 {
-                                    yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(selectedPermanent));
+                                    yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateDebuffEffect(permanent));
                                 }
 
                                 string EffectDiscription1()
                                 {
-                                    return "[End of Your Turn] Delete this Digimon.";
+                                    return "[End of Attack] Delete this Digimon.";
                                 }
 
                                 bool CanUseCondition1(Hashtable hashtable1)
                                 {
-                                    if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                    if (CardEffectCommons.IsOpponentTurn(card))
                                     {
-                                        if (selectedPermanent.TopCard.Owner.GetBattleAreaDigimons().Contains(selectedPermanent))
+                                        if (CardEffectCommons.IsPermanentExistsOnOwnerBattleArea(permanent, permanent.TopCard))
                                         {
-                                            if (GManager.instance.turnStateMachine.gameContext.TurnPlayer == selectedPermanent.TopCard.Owner)
+                                            if (CardEffectCommons.CanTriggerOnEndAttack(hashtable1, permanent.TopCard))
                                             {
                                                 return true;
                                             }
@@ -303,7 +270,7 @@ namespace DCGO.CardEffects.EX7
 
                                 bool CanActivateCondition1(Hashtable hashtable1)
                                 {
-                                    if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                    if (CardEffectCommons.IsPermanentExistsOnBattleArea(permanent))
                                     {
                                         if (!permanent.TopCard.CanNotBeAffected(activateClass))
                                         {
@@ -316,10 +283,10 @@ namespace DCGO.CardEffects.EX7
 
                                 IEnumerator ActivateCoroutine1(Hashtable _hashtable1)
                                 {
-                                    if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
+                                    if (CardEffectCommons.IsPermanentExistsOnBattleArea(permanent))
                                     {
                                         yield return ContinuousController.instance.StartCoroutine(new DestroyPermanentsClass(
-                                        new List<Permanent>() { selectedPermanent },
+                                        new List<Permanent>() { permanent },
                                         CardEffectCommons.CardEffectHashtable(activateClass1)).Destroy());
                                     }
                                 }
@@ -333,6 +300,7 @@ namespace DCGO.CardEffects.EX7
 
                                     return null;
                                 }
+
                             }
                         }
                     }

+ 3 - 6
Assets/CardEffect/EX7/Purple/Yuuki_EX7_065.cs

@@ -117,14 +117,11 @@ namespace DCGO.CardEffects.EX7
                     {
                         if (card.Owner.HandCards.Count <= 4)
                         {
-                            if (CardEffectCommons.CanDeclareOptionDelayEffect(card))
+                            if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                             {
-                                if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
+                                if (CardEffectCommons.CanActivateSuspendCostEffect(card))
                                 {
-                                    if (CardEffectCommons.CanActivateSuspendCostEffect(card))
-                                    {
-                                        return true;
-                                    }
+                                    return true;
                                 }
                             }
                         }

+ 1 - 1
Assets/CardEffect/ST19/Yellow/Chaperomon_ST19_11.cs

@@ -90,7 +90,7 @@ namespace DCGO.CardEffects.ST19
             if (timing == EffectTiming.OnEnterFieldAnyone)
             {
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("DP -3000", CanUseCondition, card);
+                activateClass.SetUpICardEffect($"DP -3000/-6000", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateSharedCondition, ActivateCoroutine, -1, false, EffectDescription());
                 cardEffects.Add(activateClass);
 

+ 1 - 1
ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ae8a507a40487b5e75c628fc0e83bacfdd3d8151497c167b281e603eae45a2d
+oid sha256:828daa1f20fe8636ba1b67e29b298384970b153a732357f16ed3b6cf8f69afcc
 size 20166