Bug fixes from sheet

Assets/CardBaseEntity/EX2/Purple/Digimon/EX2_074.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e50904842b804ce0c6a80a3aa8737629569ba159571185b7f4a6a29372974aba
-size 2372
+oid sha256:b7e20a8d1131e0c373538da8e4e94e21e8704138cc74232d5fe1b1dafdcfb550
+size 2377

Assets/CardBaseEntity/EX2/Purple/Digimon/EX2_074_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2981eb833cc4cfb8e659d90343d0d2de5856ada93aa374d36f20ce4b4aadbb38
-size 2378
+oid sha256:e2759f8f7484c31889bde8adb0b8a662bd80648960f39e75c93e96d0ad1d96d2
+size 2383

Assets/CardBaseEntity/ST14/Purple/Digimon/ST14_10.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba4644d4e271570d3f76ee3e2f5615abf2dbad9d1b420a894fcd0b4776c720be
-size 2144
+oid sha256:6f8fe62fc410a4ebd79b7bcc68d7cbd797e62abd4871b89b569bec694778646b
+size 2149

Assets/CardBaseEntity/ST16/Purple/Digimon/ST16_06_P0.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8f986609bcf7183bf9e29156ab33a805bbd5093bd6f695a793f898a8e77579f8
+oid sha256:8ce5f2aec867338a32bd043076179f79f70d17903a5819e70aa7b42d2f3bd63c
 size 1063

Assets/CardEffect/BT16/Yellow/BT16_093.cs

@@ -164,7 +164,7 @@ namespace DCGO.CardEffects.BT16
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect($"Play 1 level 3 Digimon card with [Terriermon] in it's name from your hand or trash", CanUseCondition, card);
-                activateClass.SetUpActivateClass(null, ActivateCoroutine, -1, true, EffectDiscription());
+                activateClass.SetUpActivateClass(null, ActivateCoroutine, -1, false, EffectDiscription());
                 activateClass.SetIsSecurityEffect(true);
                 cardEffects.Add(activateClass);
 

Assets/CardEffect/BT18/Red/BT18_087.cs

@@ -61,10 +61,7 @@ namespace DCGO.CardEffects.BT18
                     {
                         if (CardEffectCommons.CanTriggerWhenLoseSecurity(hashtable, player => player == card.Owner.Enemy))
                         {
-                            if (CardEffectCommons.IsOwnerTurn(card))
-                            {
-                                return true;
-                            }
+                            return true;
                         }
                     }
 

Assets/CardEffect/BT20/Purple/BT20_098.cs

@@ -137,11 +137,6 @@ namespace DCGO.CardEffects.BT20
                                                cardEffect: activateClass);
                                 }
 
-                                bool CanNoSelect()
-                                {
-                                    return selectedCardsToPlay.Count == 0;
-                                }
-
                                 bool RemoveOptionsAlreadySelected(List<CardSource> cardSources, CardSource cardSource)
                                 {
                                     if (cardSources.Contains(cardSource))
@@ -154,7 +149,7 @@ namespace DCGO.CardEffects.BT20
                                     canTargetCondition: CanSelectPlayCardCondition,
                                     canTargetCondition_ByPreSelecetedList: RemoveOptionsAlreadySelected,
                                     canEndSelectCondition: null,
-                                    canNoSelect: CanNoSelect,
+                                    canNoSelect: () => true,
                                     selectCardCoroutine: SelectCardCoroutine2,
                                     afterSelectCardCoroutine: null,
                                     message: "Select 1 card to play.",

Assets/CardEffect/EX2/Purple/EX2_065.cs

@@ -28,7 +28,7 @@ namespace DCGO.CardEffects.EX2
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    return cardSource.EqualsCardName("Beelzemon Blast Mode");
+                    return cardSource.EqualsCardName("Beelzemon: Blast Mode");
                 }
 
                 bool PermanentCondition(Permanent permanent)

Assets/CardEffect/EX8/Blue/EX8_024.cs

@@ -112,7 +112,7 @@ namespace DCGO.CardEffects.EX8
             if (timing == EffectTiming.OnAllyAttack)
             {
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("1 opponents digimon can't unsuspend", CanUseCondition, card);
+                activateClass.SetUpICardEffect("1 opponents digimon can't suspend", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, false, EffectDiscription());
                 activateClass.SetHashString("WhenAttacking_EX8_024");
                 cardEffects.Add(activateClass);
@@ -156,7 +156,7 @@ namespace DCGO.CardEffects.EX8
                         mode: SelectPermanentEffect.Mode.Custom,
                         cardEffect: activateClass);
 
-                    selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon that can't unsuspend.", "The opponent is selecting 1 Digimon that can't unsuspend.");
+                    selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon that can't suspend.", "The opponent is selecting 1 Digimon that can't suspend.");
 
                     yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
 

Assets/CardEffect/EX8/Blue/EX8_026.cs

@@ -215,7 +215,7 @@ namespace DCGO.CardEffects.EX8
             if (timing == EffectTiming.None)
             {
                 CanNotSuspendClass canNotSuspendClass = new CanNotSuspendClass();
-                canNotSuspendClass.SetUpICardEffect("Can't Suspend", CanUseCondition, card);
+                canNotSuspendClass.SetUpICardEffect("Opponents Digimon Can't Suspend", CanUseCondition, card);
                 canNotSuspendClass.SetUpCanNotSuspendClass(PermanentCondition: CantSuspendCondition);
                 cardEffects.Add(canNotSuspendClass);
 

Assets/CardEffect/P/Green/P_133.cs

@@ -123,10 +123,9 @@ namespace DCGO.CardEffects.P
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
-                        return CardEffectCommons.CanTriggerWhenPermanentDigivolving(hashtable, IsDigmonDigivolve);
-
-                    return false;
+                    return CardEffectCommons.IsExistOnBattleArea(card) &&
+                           CardEffectCommons.IsOwnerTurn(card) &&
+                           CardEffectCommons.CanTriggerWhenPermanentDigivolving(hashtable, IsDigmonDigivolve);
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)

Assets/CardEffect/ST20/Green/ST20_09.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using UnityEngine;
 
 //ST20 Megakabuterimon
 namespace DCGO.CardEffects.ST20
@@ -94,6 +95,7 @@ namespace DCGO.CardEffects.ST20
 
                     if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition) && TamerTwoColourCount() > 0)
                     {
+                        int maxCount = Mathf.Min(CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition), TamerTwoColourCount());
                         SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
 
                         selectPermanentEffect.SetUp(
@@ -101,7 +103,7 @@ namespace DCGO.CardEffects.ST20
                             canTargetCondition: CanSelectPermanentCondition,
                             canTargetCondition_ByPreSelecetedList: null,
                             canEndSelectCondition: null,
-                            maxCount: TamerTwoColourCount(),
+                            maxCount: maxCount,
                             canNoSelect: false,
                             canEndNotMax: false,
                             selectPermanentCoroutine: null,
@@ -159,6 +161,7 @@ namespace DCGO.CardEffects.ST20
 
                     if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition) && TamerTwoColourCount() > 0)
                     {
+                        int maxCount = Mathf.Min(CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition), TamerTwoColourCount());
                         SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
 
                         selectPermanentEffect.SetUp(
@@ -166,7 +169,7 @@ namespace DCGO.CardEffects.ST20
                             canTargetCondition: CanSelectPermanentCondition,
                             canTargetCondition_ByPreSelecetedList: null,
                             canEndSelectCondition: null,
-                            maxCount: TamerTwoColourCount(),
+                            maxCount: maxCount,
                             canNoSelect: false,
                             canEndNotMax: false,
                             selectPermanentCoroutine: null,

Assets/CardEffect/ST20/Yellow/ST20_05.cs

@@ -87,7 +87,7 @@ namespace DCGO.CardEffects.ST20
 
                         IEnumerator SelectPermanentCoroutine(Permanent permanent)
                         {
-                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonSAttack(targetPermanent: permanent, changeValue: -1, effectDuration: EffectDuration.UntilEachTurnEnd, activateClass: activateClass));
+                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonSAttack(targetPermanent: permanent, changeValue: -1, effectDuration: EffectDuration.UntilOpponentTurnEnd, activateClass: activateClass));
 
                             yield return null;
                         }

Assets/CardEffect/ST21/Green/ST21_09.cs

@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using UnityEngine;
 
 //ST21 Lillymon
 namespace DCGO.CardEffects.ST21
@@ -77,6 +78,8 @@ namespace DCGO.CardEffects.ST21
 
                     if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition) && TamerTwoColourCount() > 0)
                     {
+                        int maxCount = Mathf.Min(CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition), TamerTwoColourCount());
+
                         SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
 
                         selectPermanentEffect.SetUp(
@@ -84,7 +87,7 @@ namespace DCGO.CardEffects.ST21
                             canTargetCondition: CanSelectPermanentCondition,
                             canTargetCondition_ByPreSelecetedList: null,
                             canEndSelectCondition: null,
-                            maxCount: TamerTwoColourCount(),
+                            maxCount: maxCount,
                             canNoSelect: false,
                             canEndNotMax: false,
                             selectPermanentCoroutine: null,
@@ -129,6 +132,8 @@ namespace DCGO.CardEffects.ST21
 
                     if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition) && TamerTwoColourCount() > 0)
                     {
+                        int maxCount = Mathf.Min(CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition), TamerTwoColourCount());
+
                         SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
 
                         selectPermanentEffect.SetUp(
@@ -136,7 +141,7 @@ namespace DCGO.CardEffects.ST21
                             canTargetCondition: CanSelectPermanentCondition,
                             canTargetCondition_ByPreSelecetedList: null,
                             canEndSelectCondition: null,
-                            maxCount: TamerTwoColourCount(),
+                            maxCount: maxCount,
                             canNoSelect: false,
                             canEndNotMax: false,
                             selectPermanentCoroutine: null,