mbunch_kascope 2 лет назад
Родитель
Сommit
756a0a8870

+ 2 - 3
Assets/CardEffect/EX6/Purple/Beelzemon_EX6_056.cs

@@ -311,7 +311,7 @@ namespace DCGO.CardEffects.EX6
 
                         selectCardEffect.SetUpCustomMessage("Select 1 card to place at the bottom of digivolution cards.", "The opponent is selecting 1 card to place at the bottom of digivolution cards.");
 
-                        yield return StartCoroutine(selectCardEffect.Activate());
+                        yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
 
                         IEnumerator SelectCardCoroutine(CardSource cardSource)
                         {
@@ -322,7 +322,7 @@ namespace DCGO.CardEffects.EX6
 
                         if (selectedCards.Count >= 1)
                         {
-                            if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
+                            if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition, true))
                             {
                                 Permanent selectedPermanent = card.Owner.GetBreedingAreaPermanents()[0];
 
@@ -334,7 +334,6 @@ namespace DCGO.CardEffects.EX6
                         }
                     }
                 }
-                
             }
             #endregion
 

+ 3 - 2
Assets/CardEffect/EX6/Purple/Belphemon_Rage_Mode_EX6_060.cs

@@ -250,6 +250,7 @@ namespace DCGO.CardEffects.EX6
                 }
             }
             #endregion
+
             #region All Turns
             if (timing == EffectTiming.WhenRemoveField)
             {
@@ -344,7 +345,7 @@ namespace DCGO.CardEffects.EX6
 
                         selectCardEffect.SetUpCustomMessage("Select 1 card to place at the bottom of digivolution cards.", "The opponent is selecting 1 card to place at the bottom of digivolution cards.");
 
-                        yield return StartCoroutine(selectCardEffect.Activate());
+                        yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
 
                         IEnumerator SelectCardCoroutine(CardSource cardSource)
                         {
@@ -355,7 +356,7 @@ namespace DCGO.CardEffects.EX6
 
                         if (selectedCards.Count >= 1)
                         {
-                            if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
+                            if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition, true))
                             {
                                 Permanent selectedPermanent = card.Owner.GetBreedingAreaPermanents()[0];
 

+ 2 - 3
Assets/CardEffect/EX6/Purple/Creepymon_EX6_058.cs

@@ -287,7 +287,7 @@ namespace DCGO.CardEffects.EX6
 
                         selectCardEffect.SetUpCustomMessage("Select 1 card to place at the bottom of digivolution cards.", "The opponent is selecting 1 card to place at the bottom of digivolution cards.");
 
-                        yield return StartCoroutine(selectCardEffect.Activate());
+                        yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
 
                         IEnumerator SelectCardCoroutine(CardSource cardSource)
                         {
@@ -298,7 +298,7 @@ namespace DCGO.CardEffects.EX6
 
                         if (selectedCards.Count >= 1)
                         {
-                            if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
+                            if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition, true))
                             {
                                 Permanent selectedPermanent = card.Owner.GetBreedingAreaPermanents()[0];
 
@@ -310,7 +310,6 @@ namespace DCGO.CardEffects.EX6
                         }
                     }
                 }
-
             }
             #endregion
 

+ 3 - 2
Assets/CardEffect/EX6/Purple/Leviamon_EX6_061.cs

@@ -2,6 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System;
 using System.Linq;
+using UnityEngine;
 
 namespace DCGO.CardEffects.EX6
 {
@@ -277,7 +278,7 @@ namespace DCGO.CardEffects.EX6
 
                         selectCardEffect.SetUpCustomMessage("Select 1 card to place at the bottom of digivolution cards.", "The opponent is selecting 1 card to place at the bottom of digivolution cards.");
 
-                        yield return StartCoroutine(selectCardEffect.Activate());
+                        yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
 
                         IEnumerator SelectCardCoroutine(CardSource cardSource)
                         {
@@ -288,7 +289,7 @@ namespace DCGO.CardEffects.EX6
 
                         if (selectedCards.Count >= 1)
                         {
-                            if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
+                            if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition, true))
                             {
                                 Permanent selectedPermanent = card.Owner.GetBreedingAreaPermanents()[0];
 

+ 1 - 3
Assets/CardEffect/EX6/Purple/Ogudomon_EX6_073.cs

@@ -343,8 +343,6 @@ namespace DCGO.CardEffects.EX6
                 {
                     if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
-                        //TODO: Most likely the culprit
-                        Debug.Log($"CAN ACTIVATE: {card.PermanentOfThisCard().cardSources.Count(HasSevelGreatDemonLordsTrait)}");
                         if(card.PermanentOfThisCard().cardSources.Count(HasSevelGreatDemonLordsTrait) >= 7)
                         {
                             return true;
@@ -419,7 +417,7 @@ namespace DCGO.CardEffects.EX6
                             canEndNotMax: false,
                             selectPermanentCoroutine: SelectPermanentCoroutine,
                             afterSelectPermanentCoroutine: null,
-                            mode: SelectPermanentEffect.Mode.Custom,
+                            mode: SelectPermanentEffect.Mode.Destroy,
                             cardEffect: activateClass);
 
                         yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());