ex7, promo updates

Assets/CardBaseEntity/P/Black/Option/Defense_Training-P-107.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:676c1d4c86b29699597c251f7497d8888a84a1ca887c1e0d7b03fd47bcd009ea
-size 3091
+oid sha256:63e784010c7379fb879c8cc2b49e58408ea7de4e5cbb6ba12b612adaaf3f7730
+size 2923

Assets/CardBaseEntity/P/Blue/Digimon/アルフォースブイドラモンゼロ-P-048.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e102d8e4a3beb8bede55cd8df4e98a9d1d3a37f7ab0ce2486a22625983ba894
-size 2549
+oid sha256:74e0d7592a4b7c73d8bb52615d4a3f1e1d0b12bfa3d3d661a17cc68f46dce8f4
+size 2322

Assets/CardBaseEntity/P/Blue/Option/メンタル・トレーニング-P-104.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9b58768d9c5213ffc91a9bbcac2778a60ec5ce8427659d7a097d633c686ca093
-size 3170
+oid sha256:b38fcaff34507cbf9aa56b27191092d0a39e58c1625026232c3d629f6b31355a
+size 2959

Assets/CardBaseEntity/P/Green/Option/アジリティ・トレーニング-P-106.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65f80b16104ef58fe573e3e4beb04dc67fca5f7d8d8ef9332e297c7a6541deba
-size 3191
+oid sha256:23da2fa7a6fd91eb2199a3deb221cf75b61e9157a338c4523b0c837139164e78
+size 2975

Assets/CardBaseEntity/P/Purple/Option/ウィズダム・トレーニング-P-108.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7313b6c4e78cc439997a302a7c054473eedd402d0fb75cbab09c7cc66babc114
-size 3191
+oid sha256:5ef7eb26438d29f6288f3f815df57f992cf6ebd4bb9f0175d4b8d15ee1a52eea
+size 2975

Assets/CardBaseEntity/P/Red/Option/オフェンス・トレーニング-P-103.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d12ccc96f656d2b7bb5a1a01feb31addf7f059719dd1204cce57bff732780bb
-size 3182
+oid sha256:883a72c65f9b13bd82c8d534c358e2e955fd99ce925844a612befc3b9820154f
+size 2967

Assets/CardBaseEntity/P/Yellow/Option/フィジカル・トレーニング-P-105.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:96765d263bf98f0f33c76b48569e0de81f21432f4eca3a727d59c4177aee262f
-size 2975
+oid sha256:7c63ea7d69aaf6bef12d27269e2e7f4fc690ecd3ae109468ec0bf2a4a6f930cf
+size 2979

Assets/CardEffect/EX7/Green/Tlalocmon_EX7_037.cs

@@ -160,7 +160,7 @@ namespace DCGO.CardEffects.EX7
                         canEndSelectCondition: CanEndSelectCondition,
                         maxCount: maxCount,
                         canNoSelect: true,
-                        canEndNotMax: false,
+                        canEndNotMax: true,
                         isShowOpponent: true,
                         selectCardCoroutine: SelectCardCoroutine,
                         afterSelectCardCoroutine: null,

Assets/CardEffect/EX7/Purple/SeventhFascination_EX7_072.cs

@@ -177,7 +177,8 @@ namespace DCGO.CardEffects.EX7
                             {
                                 if (CardEffectCommons.IsOwnerTurn(cardSource))
                                 {
-                                   return CardSourceCondition(cardSource);                                    
+                                    if(CardEffectCommons.IsExistOnBattleAreaDigimon(cardSource))
+                                        return CardSourceCondition(cardSource);                                    
                                 }
 
                                 return false;

Assets/CardEffect/EX7/Red/MagnaKidmon_EX7_013.cs

@@ -391,6 +391,8 @@ namespace DCGO.CardEffects.EX7
                                         defenderCondition: (permanent) => true,
                                         cardEffect: activateClass);
 
+                                    selectAttackEffect.SetCanNotSelectNotAttack();
+
                                     yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
                                 }
                              }

Assets/CardEffect/EX7/Red/Volcanicdramon_EX7_014.cs

@@ -265,7 +265,7 @@ namespace DCGO.CardEffects.EX7
                         canEndNotMax: false,
                         isShowOpponent: true,
                         mode: SelectCardEffect.Mode.Custom,
-                        root: SelectCardEffect.Root.Trash,
+                        root: SelectCardEffect.Root.Hand,
                         customRootCardList: null,
                         canLookReverseCard: true,
                         selectPlayer: card.Owner,
@@ -288,7 +288,7 @@ namespace DCGO.CardEffects.EX7
                         activateClass: activateClass,
                         payCost: false,
                         isTapped: false,
-                        root: SelectCardEffect.Root.Trash,
+                        root: SelectCardEffect.Root.Hand,
                         activateETB: true));
                 }
             }

Assets/CardEffect/P/Green/Galemon_P_132.cs

@@ -24,7 +24,7 @@ namespace DCGO.CardEffects.P
 
                 bool SelectDigimon(Permanent permanent)
                 {
-                    return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card);
+                    return CardEffectCommons.IsPermanentExistsOnBattleAreaDigimon(permanent);
                 }
 
                 bool CanUseCondition(Hashtable hashtable)

Assets/CardEffect/P/Green/ShotoKazama_P_133.cs

@@ -123,7 +123,10 @@ namespace DCGO.CardEffects.P
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanTriggerWhenPermanentDigivolving(hashtable, IsDigmonDigivolve);
+                    if (CardEffectCommons.IsExistOnBattleArea(card))
+                        return CardEffectCommons.CanTriggerWhenPermanentDigivolving(hashtable, IsDigmonDigivolve);
+
+                    return false;
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)

Assets/CardEffect/P/Yellow/ArisaKinosaki_P_136.cs

@@ -124,7 +124,10 @@ namespace DCGO.CardEffects.P
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanTriggerWhenPermanentDigivolving(hashtable, IsDigmonDigivolve);
+                    if (CardEffectCommons.IsExistOnBattleArea(card))
+                        return CardEffectCommons.CanTriggerWhenPermanentDigivolving(hashtable, IsDigmonDigivolve);
+
+                    return true;
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)

Assets/CardEffect/P/Yellow/ShoeShoemon_P_135.cs

@@ -118,7 +118,7 @@ namespace DCGO.CardEffects.P
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Opponent's Digimon gets -2000 DP for the turn", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, true, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, false, EffectDiscription());
                 activateClass.SetIsInheritedEffect(true);
                 activateClass.SetHashString("ChangeDP_P_135");
                 cardEffects.Add(activateClass);

Assets/CardEffect/P/Yellow/Shoemon_P_134.cs

@@ -79,7 +79,7 @@ namespace DCGO.CardEffects.P
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Opponent's Digimon gets -2000 DP for the turn", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, true, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, false, EffectDiscription());
                 activateClass.SetIsInheritedEffect(true);
                 activateClass.SetHashString("ChangeDP_P_134");
                 cardEffects.Add(activateClass);

Assets/CardEffect/ST19/Yellow/ArisaKinosaki_ST19_14.cs

@@ -61,17 +61,15 @@ namespace DCGO.CardEffects.ST19
 
                     List<Permanent> permanents = CardEffectCommons.GetPlayedPermanentsFromEnterFieldHashtable(
                         hashtable: hashtable,
-                        rootCondition: null);
+                        rootCondition: null)
+                        .Filter(PermanentCondition);
 
-                    if (permanents != null)
+                    if (permanents.Count > 0)
                     {
-                        foreach (Permanent permanent in permanents.Filter(PermanentCondition).Clone())
-                        {
-                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainRush(
-                                targetPermanent: permanent,
+                        yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainRush(
+                                targetPermanent: permanents[0],
                                 effectDuration: EffectDuration.UntilEachTurnEnd,
                                 activateClass: activateClass));
-                        }
                     }
                 }
             }