Explorar el Código

1.5.9 updates

mbunch_kascope hace 1 año
padre
commit
82b74a3005

+ 128 - 54
Assets/CardEffect/BT19/Purple/TheWickedGodDescends_BT19_099.cs

@@ -1,8 +1,9 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
+using Photon.Pun;
 
 namespace DCGO.CardEffects.BT19
 {
@@ -188,7 +189,7 @@ namespace DCGO.CardEffects.BT19
 
                 string EffectDiscription()
                 {
-                    return "[All Turns] When any of your Digimon with [Millenniummon] in its name would leave the battle area, <Delay>.\r\n You may play 1 [Wicked God] trait Digimon card with a play cost 1 greater than that Digimon from your hand or trash without paying the cost.";
+                    return "[All Turns] When any of your Digimon with [Millenniummon] in its name would leave the battle area, <Delay>.\r\n• You may play 1 [Wicked God] trait Digimon card with a play cost 1 greater than that Digimon from your hand or trash without paying the cost.";
                 }
 
                 bool PermanentCondition(Permanent permanent)
@@ -261,55 +262,67 @@ namespace DCGO.CardEffects.BT19
                     if (deleted)
                     {
                         List<Permanent> selectedPermanents = CardEffectCommons.GetPermanentsFromHashtable(_hashtable);
-                        List<CardSource> combinedSources = new List<CardSource>();
-
-                        combinedSources.AddRange(card.Owner.HandCards);
-                        combinedSources.AddRange(card.Owner.TrashCards);
 
                         bool FilterOutUnselectable(CardSource source)
                         {
                             foreach (Permanent permanent in selectedPermanents)
                             {
-                                return permanent.TopCard.GetCostItself + 1 == source.GetCostItself;
-                            }                                
+                                if (PermanentCondition(permanent))
+                                    return permanent.TopCard.GetCostItself + 1 == source.GetCostItself;
+                            }
 
                             return false;
                         }
 
-                        combinedSources = combinedSources.Filter(FilterOutUnselectable);
-
-                        if (combinedSources.Count > 0)
+                        if (selectedPermanents.Count > 0)
                         {
-                            if (selectedPermanents.Count > 0)
+                            if (card.Owner.HandCards.Count(FilterOutUnselectable) >= 1 || CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, FilterOutUnselectable))
                             {
-                                List<CardSource> selectedCards = new List<CardSource>();
+                                if (card.Owner.HandCards.Count(FilterOutUnselectable) >= 1 && CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, FilterOutUnselectable))
+                                {
+                                    if (card.Owner.isYou)
+                                    {
+                                        GManager.instance.commandText.OpenCommandText("From which area do you play a card?");
+
+                                        List<Command_SelectCommand> command_SelectCommands = new List<Command_SelectCommand>()
+                                {
+                                    new Command_SelectCommand($"From hand", () => photonView.RPC("SetFromHand", RpcTarget.All, true), 0),
+                                    new Command_SelectCommand($"From trash", () => photonView.RPC("SetFromHand", RpcTarget.All, false), 1),
+                                };
+
+                                        GManager.instance.selectCommandPanel.SetUpCommandButton(command_SelectCommands);
+                                    }
+
+                                    else
+                                    {
+                                        GManager.instance.commandText.OpenCommandText("The opponent is choosing from which area to play a card.");
+
+                                        #region AIモード
+                                        if (GManager.instance.IsAI)
+                                        {
+                                            SetFromHand(RandomUtility.IsSucceedProbability(0.5f));
+                                        }
+                                        #endregion
+                                    }
+                                }
+
+                                else if (card.Owner.HandCards.Count(FilterOutUnselectable) == 0 && CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, FilterOutUnselectable))
+                                {
+                                    SetFromHand(false);
+                                }
+
+                                else if (card.Owner.HandCards.Count(FilterOutUnselectable) >= 1 && card.Owner.TrashCards.Count(FilterOutUnselectable) == 0)
+                                {
+                                    SetFromHand(true);
+                                }
+
+                                yield return new WaitWhile(() => !endSelect);
+                                endSelect = false;
 
-                                SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
-
-                                selectCardEffect.SetUp(
-                                            canTargetCondition: CanPlayWickedGodCondition,
-                                            canTargetCondition_ByPreSelecetedList: null,
-                                            canEndSelectCondition: null,
-                                            canNoSelect: () => false,
-                                            selectCardCoroutine: SelectCardCoroutine,
-                                            afterSelectCardCoroutine: null,
-                                            message: "Select 1 [Wicked God] trait Digimon card to play.",
-                                            maxCount: 1,
-                                            canEndNotMax: false,
-                                            isShowOpponent: true,
-                                            mode: SelectCardEffect.Mode.Custom,
-                                            root: SelectCardEffect.Root.Custom,
-                                            customRootCardList: combinedSources,
-                                            canLookReverseCard: true,
-                                            selectPlayer: card.Owner,
-                                            cardEffect: activateClass);
-
-                                selectCardEffect.SetUpCustomMessage(
-                                    "Select 1 [Wicked God] trait Digimon card to play.",
-                                    "The opponent is selecting 1 [Wicked God] trait Digimon card to play.");
-                                selectCardEffect.SetUpCustomMessage_ShowCard("Played Card");
-
-                                yield return StartCoroutine(selectCardEffect.Activate());
+                                GManager.instance.commandText.CloseCommandText();
+                                yield return new WaitWhile(() => GManager.instance.commandText.gameObject.activeSelf);
+
+                                List<CardSource> selectedCards = new List<CardSource>();
 
                                 IEnumerator SelectCardCoroutine(CardSource cardSource)
                                 {
@@ -318,26 +331,77 @@ namespace DCGO.CardEffects.BT19
                                     yield return null;
                                 }
 
-                                if (CardEffectCommons.IsExistOnHand(selectedCards[0]))
+                                if (fromHand)
                                 {
-                                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.PlayPermanentCards(
-                                        cardSources: selectedCards,
-                                        activateClass: activateClass,
-                                        payCost: false,
-                                        isTapped: false,
-                                        root: SelectCardEffect.Root.Hand,
-                                        activateETB: true));
+                                    int maxCount = 1;
+
+                                    SelectHandEffect selectHandEffect = GManager.instance.GetComponent<SelectHandEffect>();
+
+                                    selectHandEffect.SetUp(
+                                        selectPlayer: card.Owner,
+                                        canTargetCondition: CanPlayWickedGodCondition,
+                                        canTargetCondition_ByPreSelecetedList: null,
+                                        canEndSelectCondition: null,
+                                        maxCount: maxCount,
+                                        canNoSelect: true,
+                                        canEndNotMax: false,
+                                        isShowOpponent: true,
+                                        selectCardCoroutine: SelectCardCoroutine,
+                                        afterSelectCardCoroutine: null,
+                                        mode: SelectHandEffect.Mode.Custom,
+                                        cardEffect: activateClass);
+
+                                    selectHandEffect.SetUpCustomMessage(
+                                        "Select 1 [Wicked God] trait Digimon card to play.",
+                                        "The opponent is selecting 1 [Wicked God] trait Digimon card to play.");
+                                    selectHandEffect.SetUpCustomMessage_ShowCard("Played Card");
+
+                                    yield return StartCoroutine(selectHandEffect.Activate());
                                 }
-                                else if (CardEffectCommons.IsExistOnTrash(selectedCards[0]))
+                                else
                                 {
-                                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.PlayPermanentCards(
-                                        cardSources: selectedCards,
-                                        activateClass: activateClass,
-                                        payCost: false,
-                                        isTapped: false,
+                                    SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
+
+                                    selectCardEffect.SetUp(
+                                        canTargetCondition: CanPlayWickedGodCondition,
+                                        canTargetCondition_ByPreSelecetedList: null,
+                                        canEndSelectCondition: null,
+                                        canNoSelect: () => false,
+                                        selectCardCoroutine: SelectCardCoroutine,
+                                        afterSelectCardCoroutine: null,
+                                        message: "Select 1 [Wicked God] trait Digimon card to play.",
+                                        maxCount: 1,
+                                        canEndNotMax: false,
+                                        isShowOpponent: true,
+                                        mode: SelectCardEffect.Mode.Custom,
                                         root: SelectCardEffect.Root.Trash,
-                                        activateETB: true));
+                                        customRootCardList: null,
+                                        canLookReverseCard: true,
+                                        selectPlayer: card.Owner,
+                                        cardEffect: activateClass);
+
+                                    selectCardEffect.SetUpCustomMessage(
+                                        "Select 1 [Wicked God] trait Digimon card to play.",
+                                        "The opponent is selecting 1 [Wicked God] trait Digimon card to play.");
+                                    selectCardEffect.SetUpCustomMessage_ShowCard("Played Card");
+
+                                    yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
+                                }
+
+                                SelectCardEffect.Root root = SelectCardEffect.Root.Hand;
+
+                                if (!fromHand)
+                                {
+                                    root = SelectCardEffect.Root.Trash;
                                 }
+
+                                yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.PlayPermanentCards(
+                                    cardSources: selectedCards,
+                                    activateClass: activateClass,
+                                    payCost: false,
+                                    isTapped: false,
+                                    root: root,
+                                    activateETB: true));
                             }
                         }
                     }
@@ -354,5 +418,15 @@ namespace DCGO.CardEffects.BT19
 
             return cardEffects;
         }
+
+        bool endSelect = false;
+        bool fromHand = false;
+
+        [PunRPC]
+        public void SetFromHand(bool fromHand)
+        {
+            this.fromHand = fromHand;
+            endSelect = true;
+        }
     }
 }

+ 1 - 1
Assets/CardEffect/BT6/Blue/IshidaYamato_BT6_088.cs

@@ -124,7 +124,7 @@ public class IshidaYamato_BT6_088 : CEntity_Effect
 
             bool CanSelectCardCondition(CardSource cardSource)
             {
-                return cardSource.CardNames.Contains("Gabumon-BondofFriendship");
+                return cardSource.EqualsCardName("Gabumon - Bond of Friendship");
             }
 
             bool CanUseCondition(Hashtable hashtable)

+ 1 - 1
Assets/CardEffect/BT6/Red/Agumon_BT6_007.cs

@@ -78,7 +78,7 @@ public class Agumon_BT6_007 : CEntity_Effect
                 {
                     if (CardEffectCommons.IsOwnerTurn(card))
                     {
-                        if (card.PermanentOfThisCard().TopCard.CardNames.Contains("Agumon-BondofBravery"))
+                        if (card.PermanentOfThisCard().TopCard.EqualsCardName("Agumon - Bond of Bravery"))
                         {
                             return true;
                         }

+ 1 - 1
Assets/CardEffect/BT6/Red/YagamiTaichi_BT6_087.cs

@@ -125,7 +125,7 @@ public class YagamiTaichi_BT6_087 : CEntity_Effect
 
             bool CanSelectCardCondition(CardSource cardSource)
             {
-                return cardSource.CardNames.Contains("Agumon-BondofBravery");
+                return cardSource.EqualsCardName("Agumon - Bond of Bravery");
             }
 
             bool CanUseCondition(Hashtable hashtable)

+ 1 - 6
Assets/CardEffect/LM/Black/SepiaMemoryBoost_LM_037.cs

@@ -20,12 +20,7 @@ namespace DCGO.CardEffects.LM
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, (permanent) => permanent.TopCard.CardColors.Contains(CardColor.Yellow)))
-                    {
-                        return true;
-                    }
-
-                    return false;
+                    return CardEffectCommons.HasMatchConditionPermanent((permanent) => permanent.TopCard.Owner == card.Owner && permanent.TopCard.CardColors.Contains(CardColor.Yellow), true);
                 }
 
                 bool CardCondition(CardSource cardSource)

+ 5 - 15
Assets/CardEffect/LM/Blue/BlueScramble_LM_028.cs

@@ -95,7 +95,7 @@ namespace DCGO.CardEffects.LM
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Return a blue Digimon to top of the deck from trash, then play a blue Digimon from trash.", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
+                activateClass.SetUpActivateClass(null, ActivateCoroutine, -1, false, EffectDiscription());
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
@@ -132,20 +132,10 @@ namespace DCGO.CardEffects.LM
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanDeclareOptionDelayEffect(card);
-                }
-
-                bool CanActivateCondition(Hashtable hashtable)
-                {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
-                    {
-                        if (card.Owner.Enemy.GetBattleAreaDigimons().Count >= 1)
-                        {
-                            return true;
-                        }
-                    }
-
-                    return false;
+                    return CardEffectCommons.IsOwnerTurn(card) &&
+                           CardEffectCommons.IsExistOnBattleArea(card) &&
+                           card.Owner.Enemy.GetBattleAreaDigimons().Count >= 1 &&
+                           CardEffectCommons.CanDeclareOptionDelayEffect(card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

+ 1 - 6
Assets/CardEffect/LM/Blue/WisteriaMemoryBoost_LM_034.cs

@@ -20,12 +20,7 @@ namespace DCGO.CardEffects.LM
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, (permanent) => permanent.TopCard.CardColors.Contains(CardColor.Red)))
-                    {
-                        return true;
-                    }
-
-                    return false;
+                    return CardEffectCommons.HasMatchConditionPermanent((permanent) => permanent.TopCard.Owner == card.Owner && permanent.TopCard.CardColors.Contains(CardColor.Red), true);
                 }
 
                 bool CardCondition(CardSource cardSource)

+ 5 - 15
Assets/CardEffect/LM/Green/GreenScramble_LM_030.cs

@@ -95,7 +95,7 @@ namespace DCGO.CardEffects.LM
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Return a green Digimon to top of the deck from trash, then play a green Digimon from trash.", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
+                activateClass.SetUpActivateClass(null, ActivateCoroutine, -1, false, EffectDiscription());
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
@@ -132,20 +132,10 @@ namespace DCGO.CardEffects.LM
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanDeclareOptionDelayEffect(card);
-                }
-
-                bool CanActivateCondition(Hashtable hashtable)
-                {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
-                    {
-                        if (card.Owner.Enemy.GetBattleAreaDigimons().Count >= 1)
-                        {
-                            return true;
-                        }
-                    }
-
-                    return false;
+                    return CardEffectCommons.IsOwnerTurn(card) &&
+                           CardEffectCommons.IsExistOnBattleArea(card) &&
+                           card.Owner.Enemy.GetBattleAreaDigimons().Count >= 1 &&
+                           CardEffectCommons.CanDeclareOptionDelayEffect(card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

+ 1 - 6
Assets/CardEffect/LM/Green/JadeMemoryBoost_LM_036.cs

@@ -20,12 +20,7 @@ namespace DCGO.CardEffects.LM
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, (permanent) => permanent.TopCard.CardColors.Contains(CardColor.Blue)))
-                    {
-                        return true;
-                    }
-
-                    return false;
+                    return CardEffectCommons.HasMatchConditionPermanent((permanent) => permanent.TopCard.Owner == card.Owner && permanent.TopCard.CardColors.Contains(CardColor.Blue), true);
                 }
 
                 bool CardCondition(CardSource cardSource)

+ 1 - 6
Assets/CardEffect/LM/Purple/GrapeMemoryBoost_LM_038.cs

@@ -20,12 +20,7 @@ namespace DCGO.CardEffects.LM
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, (permanent) => permanent.TopCard.CardColors.Contains(CardColor.Green)))
-                    {
-                        return true;
-                    }
-
-                    return false;
+                    return CardEffectCommons.HasMatchConditionPermanent((permanent) => permanent.TopCard.Owner == card.Owner && permanent.TopCard.CardColors.Contains(CardColor.Green), true);
                 }
 
                 bool CardCondition(CardSource cardSource)

+ 2 - 1
Assets/CardEffect/LM/Purple/MegidramonAce_LM_026.cs

@@ -160,7 +160,8 @@ namespace DCGO.CardEffects.LM
                 bool CanUseCondition(Hashtable hashtable)
                 {
                     return CardEffectCommons.IsExistOnBattleAreaDigimon(card) &&
-                           CardEffectCommons.CanTriggerWhenRemoveField(hashtable, card);
+                           CardEffectCommons.CanTriggerWhenRemoveField(hashtable, card) &&
+                           activateClass.IsSameEffect(CardEffectCommons.GetCardEffectFromHashtable(hashtable));
                 }
 
                 bool CanSelectCardCondition(CardSource cardSource)

+ 5 - 15
Assets/CardEffect/LM/Purple/PurpleScramble_LM_032.cs

@@ -95,7 +95,7 @@ namespace DCGO.CardEffects.LM
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Return a purple Digimon to top of the deck from trash, then play a purple Digimon from trash.", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
+                activateClass.SetUpActivateClass(null, ActivateCoroutine, -1, false, EffectDiscription());
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
@@ -132,20 +132,10 @@ namespace DCGO.CardEffects.LM
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanDeclareOptionDelayEffect(card);
-                }
-
-                bool CanActivateCondition(Hashtable hashtable)
-                {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
-                    {
-                        if (card.Owner.Enemy.GetBattleAreaDigimons().Count >= 1)
-                        {
-                            return true;
-                        }
-                    }
-
-                    return false;
+                    return CardEffectCommons.IsOwnerTurn(card) &&
+                           CardEffectCommons.IsExistOnBattleArea(card) &&
+                           card.Owner.Enemy.GetBattleAreaDigimons().Count >= 1 &&
+                           CardEffectCommons.CanDeclareOptionDelayEffect(card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

+ 1 - 6
Assets/CardEffect/LM/Red/GarnetMemoryBoost_LM_033.cs

@@ -20,12 +20,7 @@ namespace DCGO.CardEffects.LM
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, (permanent) => permanent.TopCard.CardColors.Contains(CardColor.Black)))
-                    {
-                        return true;
-                    }
-
-                    return false;
+                    return CardEffectCommons.HasMatchConditionPermanent((permanent) => permanent.TopCard.Owner == card.Owner && permanent.TopCard.CardColors.Contains(CardColor.Black), true);
                 }
 
                 bool CardCondition(CardSource cardSource)

+ 5 - 15
Assets/CardEffect/LM/Red/RedScramble_LM_027.cs

@@ -95,7 +95,7 @@ namespace DCGO.CardEffects.LM
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Return a red Digimon to top of the deck from trash, then play a red Digimon from trash.", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
+                activateClass.SetUpActivateClass(null, ActivateCoroutine, -1, false, EffectDiscription());
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
@@ -132,20 +132,10 @@ namespace DCGO.CardEffects.LM
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanDeclareOptionDelayEffect(card);
-                }
-
-                bool CanActivateCondition(Hashtable hashtable)
-                {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
-                    {
-                        if (card.Owner.Enemy.GetBattleAreaDigimons().Count >= 1)
-                        {
-                           return true;                            
-                        }
-                    }
-
-                    return false;
+                    return CardEffectCommons.IsOwnerTurn(card) &&
+                           CardEffectCommons.IsExistOnBattleArea(card) &&
+                           card.Owner.Enemy.GetBattleAreaDigimons().Count >= 1 &&
+                           CardEffectCommons.CanDeclareOptionDelayEffect(card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

+ 1 - 6
Assets/CardEffect/LM/Yellow/AmberMemoryBoost_LM_035.cs

@@ -20,12 +20,7 @@ namespace DCGO.CardEffects.LM
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, (permanent) => permanent.TopCard.CardColors.Contains(CardColor.Purple)))
-                    {
-                        return true;
-                    }
-
-                    return false;
+                    return CardEffectCommons.HasMatchConditionPermanent((permanent) => permanent.TopCard.Owner == card.Owner && permanent.TopCard.CardColors.Contains(CardColor.Purple), true);
                 }
 
                 bool CardCondition(CardSource cardSource)

+ 5 - 15
Assets/CardEffect/LM/Yellow/YellowScramble_LM_029.cs

@@ -95,7 +95,7 @@ namespace DCGO.CardEffects.LM
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Return a yellow Digimon to top of the deck from trash, then play a yellow Digimon from trash.", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
+                activateClass.SetUpActivateClass(null, ActivateCoroutine, -1, false, EffectDiscription());
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
@@ -132,20 +132,10 @@ namespace DCGO.CardEffects.LM
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanDeclareOptionDelayEffect(card);
-                }
-
-                bool CanActivateCondition(Hashtable hashtable)
-                {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
-                    {
-                        if (card.Owner.Enemy.GetBattleAreaDigimons().Count >= 1)
-                        {
-                            return true;
-                        }
-                    }
-
-                    return false;
+                    return CardEffectCommons.IsOwnerTurn(card) &&
+                           CardEffectCommons.IsExistOnBattleArea(card) &&
+                           card.Owner.Enemy.GetBattleAreaDigimons().Count >= 1 &&
+                           CardEffectCommons.CanDeclareOptionDelayEffect(card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

+ 0 - 2
Assets/Scripts/CardEffectCommons.cs

@@ -4,8 +4,6 @@ using System;
 using System.Linq;
 using UnityEngine;
 using UnityEditor;
-using UnityEditor.Experimental.GraphView;
-
 public partial class CardEffectCommons
 { 
     #region Digivolution Requirements

+ 1 - 1
ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d1a977a3e3ce4e28ed8ebbc17a2ddf6243e7d94cfc7c508063d2516b08c622e7
+oid sha256:c2ee1b2b60df63ed91322c80501fc05045f036d414eb248cbda2f06fd198a064
 size 20166