Explorar o código

LoogarmonBT15-075, SiriusmonLM-001, PublimonLM-007, DoubleTyphoonS17-11

mbunch_kascope %!s(int64=2) %!d(string=hai) anos
pai
achega
44035edd50

+ 1 - 1
Assets/CardEffect/BT15/Purple/Loogarmon_BT15_075.cs

@@ -50,7 +50,7 @@ public class Loogarmon_BT15_075 : CEntity_Effect
 
             string EffectDiscription()
             {
-                return "[When Digivolving] Delete 1 of your opponent's Digimon with 4000 DP or less. If an opponent's Digimon isn't deleted by this effect, you may digivolve this Digimon into a level 6 Digimon card with [Gallantmon] in its name in your hand for its digivolution cost. When this Digimon would digivolve with this effect, reduce the digivolution cost by 1.";
+                return "[When Digivolving][When Attacking] By trashing 1 card in your hand, this Digimon gets +2000 DP for the turn. If a Tamer card with the [SoC] trait is in this Digimon's digivolution cards, <Draw 1>.";
             }
 
             bool CanUseCondition(Hashtable hashtable)

+ 45 - 45
Assets/CardEffect/LM/Red/Siriusmon_LM_001.cs

@@ -97,67 +97,67 @@ namespace DCGO.CardEffects.LM
                             selectedCards.Add(cardSource);
                             yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(selectedCards, activateClass));
                         }
+                    }
 
-                        #region Then, Delete 1 of your opponent's Digimon with 8000 DP or less.
-                        int MaxDP()
-                        {
-                            int DP = 8000;
+                    #region Then, Delete 1 of your opponent's Digimon with 8000 DP or less.
+                    int MaxDP()
+                    {
+                        int DP = 8000;
 
-                            List<CardColor> cardColors = new List<CardColor>();
+                        List<CardColor> cardColors = new List<CardColor>();
 
-                            foreach (CardSource source in card.PermanentOfThisCard().cardSources)
+                        foreach (CardSource source in card.PermanentOfThisCard().cardSources)
+                        {
+                            foreach (CardColor cardColor in source.CardColors)
                             {
-                                foreach (CardColor cardColor in source.CardColors)
-                                {
-                                    if (!cardColors.Contains(cardColor))
-                                        cardColors.Add(cardColor);
-                                }
+                                if (!cardColors.Contains(cardColor))
+                                    cardColors.Add(cardColor);
                             }
+                        }
 
-                            cardColors = cardColors.Distinct().ToList();
+                        cardColors = cardColors.Distinct().ToList();
 
-                            DP += cardColors.Count * 1000;
+                        DP += cardColors.Count * 1000;
 
-                            return DP;
-                        }
+                        return DP;
+                    }
 
-                        bool CanSelectPermanentCondition(Permanent permanent)
+                    bool CanSelectPermanentCondition(Permanent permanent)
+                    {
+                        if (CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card))
                         {
-                            if (CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card))
+                            if (permanent.DP <= card.Owner.MaxDP_DeleteEffect(MaxDP(), activateClass))
                             {
-                                if (permanent.DP <= card.Owner.MaxDP_DeleteEffect(MaxDP(), activateClass))
-                                {
-                                    return true;
-                                }
+                                return true;
                             }
-
-                            return false;
                         }
 
-                        if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
-                        {
-                            int maxDeleteCount = System.Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
-
-                            SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
-
-                            selectPermanentEffect.SetUp(
-                                selectPlayer: card.Owner,
-                                canTargetCondition: CanSelectPermanentCondition,
-                                canTargetCondition_ByPreSelecetedList: null,
-                                canEndSelectCondition: null,
-                                maxCount: maxDeleteCount,
-                                canNoSelect: false,
-                                canEndNotMax: false,
-                                selectPermanentCoroutine: null,
-                                afterSelectPermanentCoroutine: null,
-                                mode: SelectPermanentEffect.Mode.Destroy,
-                                cardEffect: activateClass);
-
-                            yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
-                        }
+                        return false;
+                    }
+
+                    if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
+                    {
+                        int maxDeleteCount = System.Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
+
+                        SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
 
-                        #endregion
+                        selectPermanentEffect.SetUp(
+                            selectPlayer: card.Owner,
+                            canTargetCondition: CanSelectPermanentCondition,
+                            canTargetCondition_ByPreSelecetedList: null,
+                            canEndSelectCondition: null,
+                            maxCount: maxDeleteCount,
+                            canNoSelect: false,
+                            canEndNotMax: false,
+                            selectPermanentCoroutine: null,
+                            afterSelectPermanentCoroutine: null,
+                            mode: SelectPermanentEffect.Mode.Destroy,
+                            cardEffect: activateClass);
+
+                        yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
                     }
+
+                    #endregion
                 }
             }
 

+ 4 - 3
Assets/CardEffect/LM/Yellow/Publimon_LM_007.cs

@@ -57,11 +57,12 @@ namespace DCGO.CardEffects.LM
 
                         if (!cardSource.IsToken)
                         {
-                            yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddSecurityCard(cardSource));
-
                             yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateRecoveryEffect(cardSource.Owner));
 
-                            yield return ContinuousController.instance.StartCoroutine(new IAddSecurity(cardSource.Owner).AddSecurity());
+                            yield return ContinuousController.instance.StartCoroutine(new IPutSecurityPermanent(
+                                    permanent,
+                                    CardEffectCommons.CardEffectHashtable(activateClass),
+                                    true).PutSecurity());
                         }
                     }
                 }

+ 4 - 2
Assets/CardEffect/ST17/Green/DoubleTyphoon_ST17_11.cs

@@ -255,9 +255,11 @@ namespace DCGO.CardEffects.ST17
                             cardEffect: activateClass);
 
                         yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
-
-                        cardEffects.Add(CardEffectFactory.PlaceSelfDelayOptionSecurityEffect(card));
                     }
+
+                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.PlaceDelayOptionCards(
+                                card: card,
+                                cardEffect: activateClass));
                 }
             }
             #endregion