Davis&ken, beastly storm, terriermon X, collision not forcing block (needs testing)

Assets/CardEffect/BT16/Blue/DavisMotomiyaAndKenIchijoji_BT16_085.cs

@@ -182,7 +182,7 @@ namespace DCGO.CardEffects.BT16
             if (timing == EffectTiming.OnEnterFieldAnyone)
             {
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("", CanUseCondition, card);
+                activateClass.SetUpICardEffect("Memory +1", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
                 cardEffects.Add(activateClass);
 

Assets/CardEffect/BT16/Green/TerriermonXAntibody_BT16_038.cs

@@ -47,7 +47,7 @@ namespace DCGO.CardEffects.BT16
                         }
                     }
 
-                    return true;
+                    return false;
                 }
 
                 bool CardCondition(CardSource cardSource)

Assets/CardEffect/BT16/Red/BeastlyStormDanceofAffection_BT16_091.cs

@@ -249,18 +249,18 @@ namespace DCGO.CardEffects.BT16
             if (timing == EffectTiming.SecuritySkill)
             {
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("Play 1 [Aquilamon] or [Gatomon]", CanUseCondition, card);
+                activateClass.SetUpICardEffect("Play 1 [Hawkmon] or [Salamon]", CanUseCondition, card);
                 activateClass.SetUpActivateClass(null, ActivateCoroutine, -1, true, EffectDiscription());
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
                 {
-                    return "[Security] You may play 1 [Aquilamon] or [Gatomon] from your hand without paying the cost. Then, add this card to the hand.";
+                    return "[Security] You may play 1 [Hawkmon] or [Salamon] from your hand or trash without paying the cost. Then, add this card to the hand.";
                 }
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    if (cardSource.CardNames.Contains("Aquilamon") || cardSource.CardNames.Contains("Gatomon"))
+                    if (cardSource.CardNames.Contains("Hawkmon") || cardSource.CardNames.Contains("Salamon"))
                     {
                         if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
                         {

Assets/Scripts/AttackProcess.cs

@@ -295,7 +295,7 @@ public class AttackProcess : MonoBehaviourPunCallbacks
                     canTargetCondition_ByPreSelecetedList: null,
                     canEndSelectCondition: null,
                     maxCount: maxCount,
-                    canNoSelect: true,
+                    canNoSelect: (!IsBlocking),
                     canEndNotMax: false,
                     selectPermanentCoroutine: SelectPermanentCoroutine,
                     afterSelectPermanentCoroutine: null,
@@ -303,7 +303,9 @@ public class AttackProcess : MonoBehaviourPunCallbacks
                     cardEffect: null);
 
                 selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon that will block.", "The opponent is selecting 1 Digimon that will block.");
-                selectPermanentEffect.SetUpCustomBackButtonMessage("Not Block");
+                
+                if(!IsBlocking)
+                    selectPermanentEffect.SetUpCustomBackButtonMessage("Not Block");
 
                 yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
 

Assets/Scripts/CardEffectCommons/KeyWordEffects/Collision.cs

@@ -27,6 +27,8 @@ public partial class CardEffectCommons
     #region Effect process of [Collision]
     public static IEnumerator CollisionProcess(CardSource cardSource, ICardEffect activateClass, Func<IEnumerator> beforeOnAttackCoroutine = null)
     {
+        List<Permanent> enemyDigimons = new List<Permanent>();
+
         if (CanActivateCollision(cardSource))
         {
             foreach (Permanent enemyDigimon in cardSource.Owner.Enemy.GetBattleAreaDigimons())
@@ -38,9 +40,13 @@ public partial class CardEffectCommons
                         targetPermanent: enemyDigimon,
                         effectDuration: EffectDuration.UntilEndAttack,
                         activateClass: activateClass));
+
+                GManager.instance.attackProcess.IsBlocking = true;
             }
 
-            int maxCount = 1;
+
+
+            /*int maxCount = 1;
 
             Permanent selectedPermanent = null;
 
@@ -57,7 +63,7 @@ public partial class CardEffectCommons
                 selectPermanentCoroutine: SelectPermanentCoroutine,
                 afterSelectPermanentCoroutine: null,
                 mode: SelectPermanentEffect.Mode.Custom,
-                cardEffect: null);
+                cardEffect: activateClass);
 
             selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon that will block.", "The opponent is selecting 1 Digimon that will block.");
 
@@ -84,7 +90,7 @@ public partial class CardEffectCommons
                 selectedPermanent = permanent;
 
                 yield return ContinuousController.instance.StartCoroutine(GManager.instance.attackProcess.SwitchDefender(null, true, selectedPermanent));
-            }
+            }*/
         }
     }
     #endregion