mbunch_kascope пре 1 година
родитељ
комит
50f8bfa7c9

+ 1 - 1
Assets/Scripts/CardEffectCommons/GiveEffect/GiveEffectToPermanent/CanNotUnsuspend.cs

@@ -33,7 +33,7 @@ public partial class CardEffectCommons
 
         yield return ContinuousController.instance.StartCoroutine(GainCanNotUnsuspend(
             targetPermanent: targetPermanent,
-            effectDuration: EffectDuration.UntilOwnerActivePhase,
+            effectDuration: EffectDuration.UntilOpponentTurnEnd,
             activateClass: activateClass,
             condition: CanUseCondition,
             effectName: effectName

+ 17 - 5
Assets/Scripts/CardEffectCommons/KeyWordEffects/Collision.cs

@@ -65,22 +65,34 @@ public partial class CardEffectCommons
     {
         List<Permanent> enemyDigimons = cardSource.Owner.Enemy.GetBattleAreaDigimons();
 
-        bool PermanentCondition(Permanent permanent)
+        /*bool PermanentCondition(Permanent permanent)
         {
             if (IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, cardSource))
                 return !permanent.TopCard.CanNotBeAffected(activateClass);
 
             return false;
-        }
+        }*/
 
         if (CanActivateCollision(cardSource))
         {
-            yield return ContinuousController.instance.StartCoroutine(GainBlockerPlayerEffect(
+            /*yield return ContinuousController.instance.StartCoroutine(GainBlockerPlayerEffect(
                 permanentCondition: PermanentCondition,
                 effectDuration: EffectDuration.UntilEndAttack,
                 activateClass: activateClass));
-            
-            if(HasMatchConditionOpponentsPermanent(cardSource,permanent => permanent.HasBlocker))
+            */
+
+            foreach (Permanent enemyDigimon in enemyDigimons)
+            {
+                if (enemyDigimon.TopCard.CanNotBeAffected(activateClass))
+                    continue;
+
+                yield return ContinuousController.instance.StartCoroutine(GainBlocker(
+                        targetPermanent: enemyDigimon,
+                        effectDuration: EffectDuration.UntilEndAttack,
+                        activateClass: activateClass));
+            }
+
+            if (HasMatchConditionOpponentsPermanent(cardSource, permanent => permanent.HasBlocker))
                 GManager.instance.attackProcess.IsBlocking = true;
         }
     }