mike updates (9/18)

Assets/CardEffect/EX10/Black/EX10_033.cs

@@ -260,7 +260,7 @@ namespace DCGO.CardEffects.EX10
                         permanentCondition: CanSelectPermanentCondition,
                         cardCondition: HasProperTrait,
                         maxCount: 3,
-                        canNoTrash: false,
+                        canNoTrash: true,
                         isFromOnly1Permanent: false,
                         activateClass: activateClass,
                         afterSelectionCoroutine: AfterTrashedCards,

Assets/CardEffect/EX10/Black/EX10_036.cs

@@ -88,12 +88,12 @@ namespace DCGO.CardEffects.EX10
                         canTargetCondition: HasProperTrait,
                         canTargetCondition_ByPreSelecetedList: null,
                         canEndSelectCondition: CanEndSelectCondition,
-                        canNoSelect: () => true,
+                        canNoSelect: () => false,
                         selectCardCoroutine: SelectCardCoroutine,
                         afterSelectCardCoroutine: null,
                         message: "Select [Mineral] or [Rock] to place on bottom of digivolution cards\n(cards will be placed so that cards with lower numbers are on top).",
                         maxCount: 3,
-                        canEndNotMax: true,
+                        canEndNotMax: false,
                         isShowOpponent: true,
                         mode: SelectCardEffect.Mode.Custom,
                         root: SelectCardEffect.Root.Trash,
@@ -127,6 +127,7 @@ namespace DCGO.CardEffects.EX10
                     if (selectedCards.Count >= 1)
                     {
                         yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(selectedCards, activateClass));
+                        yield return ContinuousController.instance.StartCoroutine(new IUnsuspendPermanents(new List<Permanent>() { card.PermanentOfThisCard() }, activateClass).Unsuspend());
                     }
                 }
             }
@@ -174,12 +175,12 @@ namespace DCGO.CardEffects.EX10
                         canTargetCondition: HasProperTrait,
                         canTargetCondition_ByPreSelecetedList: null,
                         canEndSelectCondition: CanEndSelectCondition,
-                        canNoSelect: () => true,
+                        canNoSelect: () => false,
                         selectCardCoroutine: SelectCardCoroutine,
                         afterSelectCardCoroutine: null,
                         message: "Select [Mineral] or [Rock] to place on bottom of digivolution cards\n(cards will be placed so that cards with lower numbers are on top).",
                         maxCount: 3,
-                        canEndNotMax: true,
+                        canEndNotMax: false,
                         isShowOpponent: true,
                         mode: SelectCardEffect.Mode.Custom,
                         root: SelectCardEffect.Root.Trash,
@@ -213,6 +214,7 @@ namespace DCGO.CardEffects.EX10
                     if (selectedCards.Count >= 1)
                     {
                         yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(selectedCards, activateClass));
+                        yield return ContinuousController.instance.StartCoroutine(new IUnsuspendPermanents(new List<Permanent>() { card.PermanentOfThisCard() }, activateClass).Unsuspend());
                     }
                 }
             }

Assets/CardEffect/EX10/Black/EX10_069.cs

@@ -5,7 +5,7 @@ using System;
 //Unique Emblem: Gravel Hearts
 namespace DCGO.CardEffects.EX10
 {
-    public class EX10_096 : CEntity_Effect
+    public class EX10_069 : CEntity_Effect
     {
         public override List<ICardEffect> CardEffects(EffectTiming timing, CardSource card)
         {

Assets/CardEffect/EX10/Purple/EX10_044.cs

@@ -17,7 +17,7 @@ namespace DCGO.CardEffects.EX10
             if (timing == EffectTiming.OnEnterFieldAnyone)
             {
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("Place 1 [Bagra Army] digimon under digimon/tamer, Then draw 1", CanUseCondition, card);
+                activateClass.SetUpICardEffect("Place 1 [Bagra Army] digimon under tamer, Then draw 1", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
                 cardEffects.Add(activateClass);
 

Assets/CardEffect/EX10/Purple/EX10_045.cs

@@ -261,12 +261,12 @@ namespace DCGO.CardEffects.EX10
                                 if (selectedPermanment1 != null)
                                 {
                                     yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainBlocker(
-                                        targetPermanent: selectedPermanment,
+                                        targetPermanent: selectedPermanment1,
                                         effectDuration: EffectDuration.UntilOpponentTurnEnd,
                                         activateClass: activateClass));
 
                                     yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainRetaliation(
-                                        targetPermanent: selectedPermanment,
+                                        targetPermanent: selectedPermanment1,
                                         effectDuration: EffectDuration.UntilOpponentTurnEnd,
                                         activateClass: activateClass));
                                 }

Assets/CardEffect/EX10/Purple/EX10_050.cs

@@ -128,7 +128,7 @@ namespace DCGO.CardEffects.EX10
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                     return CardEffectCommons.CanActivateOnDeletion(card)
-                        && card.Owner.SecurityCards.Count >= 10
+                        && card.Owner.TrashCards.Count >= 10
                         && CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, IsBeelzemon);
                 }
 

Assets/Scripts/CardEffectCommons/KeyWordEffects/Collision.cs

@@ -34,7 +34,7 @@ public partial class CardEffectCommons
             return false;
         }
 
-        ActivateClass collision = CardEffectFactory.CollisionStaticEffect(permanentCondition: PermanentCondition, isInheritedEffect: false, card: card, condition: CanUseCondition);
+        ActivateClass collision = CardEffectFactory.CollisionSelfStaticEffect(false, card, CanUseCondition);
 
         AddEffectToPermanent(targetPermanent: targetPermanent, effectDuration: effectDuration, card: card, cardEffect: collision, timing: EffectTiming.OnCounterTiming);
 
@@ -48,18 +48,10 @@ public partial class CardEffectCommons
     #region Can activate [Collision]
     public static bool CanActivateCollision(CardSource cardSource)
     {
-        if (IsExistOnBattleArea(cardSource))
-        {
-            if (cardSource.Owner.Enemy.GetBattleAreaDigimons().Count >= 1)
-            {
-                if (GManager.instance.attackProcess.IsAttacking)
-                {
-                    return true;
-                }
-            }
-        }
-
-        return false;
+        return IsExistOnBattleArea(cardSource) &&
+               cardSource.Owner.Enemy.GetBattleAreaDigimons().Count >= 1 &&
+               GManager.instance.attackProcess.IsAttacking &&
+               GManager.instance.attackProcess.AttackingPermanent == cardSource.PermanentOfThisCard();
     }
     #endregion
 

Assets/Scripts/CardEffectCommons/TrashDigivolutionCards.cs

@@ -57,7 +57,7 @@ public partial class CardEffectCommons
         int digivolutionDiscardedCount = 0;
 
         void EndSelection() => digivolutionDiscardedCount = maxDigivolutionDiscardCount;
-        bool NotSelectYet() => digivolutionDiscardedCount == 0;
+        bool NotSelectYet() => digivolutionDiscardedCount <= maxDigivolutionDiscardCount;
 
         int permanentSelectedCount = 0;
 
@@ -187,9 +187,6 @@ public partial class CardEffectCommons
 
                     yield return null;
                 }
-
-                if (canEndNotMax && selectedPermanent == null)
-                    break;
             }
         }
     }