Update EX3_014.cs

Modernize slightly

Assets/Scripts/CardEffect/EX3/Red/EX3_014.cs

@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 
+// Dorbickmon
 namespace DCGO.CardEffects.EX3
 {
     public class EX3_014 : CEntity_Effect
@@ -11,11 +12,14 @@ namespace DCGO.CardEffects.EX3
         {
             List<ICardEffect> cardEffects = new List<ICardEffect>();
 
+            #region Rush
             if (timing == EffectTiming.None)
             {
                 cardEffects.Add(CardEffectFactory.RushSelfStaticEffect(isInheritedEffect: false, card: card, condition: null));
             }
+            #endregion
 
+            #region OP
             if (timing == EffectTiming.OnEnterFieldAnyone)
             {
                 int maxDP()
@@ -33,10 +37,10 @@ namespace DCGO.CardEffects.EX3
 
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Delete 1 Digimon", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDescription());
                 cardEffects.Add(activateClass);
 
-                string EffectDiscription()
+                string EffectDescription()
                 {
                     return "[On Play] Delete 1 of your opponent's Digimon with 3000 or less. For each card with [Dragon], [saur] or [Ceratopsian] in one of its traits in this Digimon's digivolution cards, add 2000 DP to the maximum DP you can choose with this effect.";
                 }
@@ -56,20 +60,13 @@ namespace DCGO.CardEffects.EX3
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanTriggerOnPlay(hashtable, card);
+                    return CardEffectCommons.IsExistOnBattleAreaTrigger(card, activateClass)
+                        && CardEffectCommons.CanTriggerOnPlay(hashtable, card);
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
-                    {
-                        if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
-                        {
-                            return true;
-                        }
-                    }
-
-                    return false;
+                    return CardEffectCommons.IsExistOnBattleAreaActivate(card, activateClass);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
@@ -97,7 +94,9 @@ namespace DCGO.CardEffects.EX3
                     }
                 }
             }
+            #endregion
 
+            #region DigiXros
             if (timing == EffectTiming.None)
             {
                 AddDigiXrosConditionClass addDigiXrosConditionClass = new AddDigiXrosConditionClass();
@@ -111,8 +110,6 @@ namespace DCGO.CardEffects.EX3
                     return true;
                 }
 
-
-
                 DigiXrosCondition GetDigiXros(CardSource cardSource)
                 {
                     if (cardSource == card)
@@ -121,21 +118,10 @@ namespace DCGO.CardEffects.EX3
 
                         bool CanSelectCardCondition(CardSource cardSource)
                         {
-                            if (cardSource != null)
-                            {
-                                if (cardSource.Owner == card.Owner)
-                                {
-                                    if (cardSource.IsDigimon)
-                                    {
-                                        if (cardSource.HasDragonTraits)
-                                        {
-                                            return true;
-                                        }
-                                    }
-                                }
-                            }
-
-                            return false;
+                            return cardSource != null
+                                && cardSource.Owner == card.Owner
+                                && cardSource.IsDigimon
+                                && cardSource.HasDragonTraits;
                         }
 
                         List<DigiXrosConditionElement> elements = new List<DigiXrosConditionElement>();
@@ -176,6 +162,7 @@ namespace DCGO.CardEffects.EX3
                     return null;
                 }
             }
+            #endregion
 
             return cardEffects;
         }