Răsfoiți Sursa

1.11.0 build

mbunch_kascope 10 luni în urmă
părinte
comite
1bcc461afc

+ 3 - 2
Assets/CardEffect/EX10/Purple/EX10_058.cs

@@ -122,9 +122,10 @@ namespace DCGO.CardEffects.EX10
                     if (selectedPermanent != null)
                     {
                         ActivateClass activateClass1 = new ActivateClass();
-                        activateClass1.SetUpICardEffect("Delete this Digimon", CanUseCondition1, selectedPermanent.TopCard);
+                        activateClass1.SetUpICardEffect("Delete 1 of your Digimon", CanUseCondition1, selectedPermanent.TopCard);
                         activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
                         activateClass1.SetEffectSourcePermanent(selectedPermanent);
+                        activateClass1.SetEffectSourceCard(selectedPermanent.TopCard);
                         selectedPermanent.UntilOwnerTurnEndEffects.Add(GetCardEffect);
 
                         if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
@@ -134,7 +135,7 @@ namespace DCGO.CardEffects.EX10
 
                         string EffectDiscription1()
                         {
-                            return "[End of Your Turn] Delete this Digimon.";
+                            return "[End of Your Turn] Delete 1 of your Digimon.";
                         }
 
                         bool CanUseCondition1(Hashtable hashtable1)

+ 38 - 23
Assets/CardEffect/EX10/Red/EX10_010.cs

@@ -119,6 +119,8 @@ namespace DCGO.CardEffects.EX10
 
             #region All Turns
 
+            #region All Turns - Immunity
+
             if (timing == EffectTiming.None)
             {
                 CanNotAffectedClass canNotAffectedClass = new CanNotAffectedClass();
@@ -127,26 +129,11 @@ namespace DCGO.CardEffects.EX10
                 cardEffects.Add(canNotAffectedClass);
 
                 bool CanUseCondition(Hashtable hashtable)
-                {
-                    return CanUse();
-                }
-
-                bool CanUse()
                 {
                     return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
                            CardEffectCommons.HasMatchConditionPermanent(OpponentsPermanent);
                 }
 
-                bool PermanentCondition(Permanent permanent)
-                {
-                    if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card))
-                    {
-                        return true;
-                    }
-
-                    return false;
-                }
-
                 bool CardCondition(CardSource cardSource)
                 {
                     if (cardSource == card)
@@ -179,20 +166,48 @@ namespace DCGO.CardEffects.EX10
                 bool OpponentsPermanent(Permanent permanent)
                 {
                     return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card) &&
-                           permanent.GetDP(card.PermanentOfThisCard()) >= 13000;
+                           card.PermanentOfThisCard().Boosts.Exists(x => x.ID == "AT_EX10-010");
                 }
+            }
+
+            #endregion
+
+            #region All Turns - DP
 
-                cardEffects.Add(CardEffectFactory.ChangeDPStaticEffect(
-                    permanentCondition: PermanentCondition,
-                    changeValue: 3000,
-                    isInheritedEffect: false,
-                    card: card,
-                    condition: CanUse,
-                    effectName: () => "This Digimon gain DP +3000"));
+            if (timing == EffectTiming.OnRemovedField || timing == EffectTiming.OnEnterFieldAnyone || timing == EffectTiming.WhenTopCardTrashed)
+            {
+                if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
+                {
+                    Permanent thisPermanent = card.PermanentOfThisCard();
+
+                    bool OpponentsPermanent(Permanent permanent)
+                    {
+                        return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card) &&
+                               permanent.DP >= 13000;
+                    }
+
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
+                    {
+                        if (CardEffectCommons.HasMatchConditionPermanent(OpponentsPermanent))
+                            thisPermanent.AddBoost(new Permanent.DPBoost("AT_EX10-010", 3000, null));
+                        else
+                        {
+                            if (thisPermanent.Boosts.Exists(x => x.ID == "AT_EX10-010"))
+                                thisPermanent.RemoveBoost("AT_EX10-010");
+                        }
+                    }
+                    else
+                    {
+                        if (thisPermanent.Boosts.Exists(x => x.ID == "AT_EX10-010"))
+                            thisPermanent.RemoveBoost("AT_EX10-010");
+                    }
+                }
             }
 
             #endregion
 
+            #endregion
+
             return cardEffects;
         }
     }

+ 2 - 2
Assets/CardEffect/EX10/White/EX10_061.cs

@@ -397,7 +397,7 @@ namespace DCGO.CardEffects.EX10
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Play 1 [Dark Masters] from sources, give <Rush>, Delete them at end of turn", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
@@ -597,7 +597,7 @@ namespace DCGO.CardEffects.EX10
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Play 1 [Dark Masters] from sources, give <Rush>, Delete them at end of turn", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()

+ 2 - 2
ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:575611f2ffeb70531b70ee08012f6a4930db2246a45ef1012ac4a4f1edf301f4
-size 20168
+oid sha256:6eb765217a27d8dc888cf43bd582a04d75aa681e7feb5226121078885f5755c1
+size 20167