1.4.6 updates

Assets/CardBaseEntity/BT17/Red/Digimon/Gallantmon-BT17-016.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1affde9b56e5d7ddbef6096c0a93b7fbb6021f345fa2cb76d67cc6e85bb78073
-size 1427
+oid sha256:8ea6b42020b62f53d8d00fdfcf08cb936aec16049f1e78d9c1158c479812c3b8
+size 1424

Assets/CardEffect/BT14/Purple/Rugamon_BT14_071.cs

@@ -193,7 +193,7 @@ public class Rugamon_BT14_071 : CEntity_Effect
             {
                 if (CardEffectCommons.IsPermanentExistsOnOwnerBattleArea(permanent, card))
                 {
-                    if (!permanent.IsPlayedOptionPermanent)
+                    if (permanent.IsDigimon || permanent.IsTamer)
                     {
                         if (permanent.TopCard.ContainsTraits("Dark Animal"))
                             return true;

Assets/CardEffect/BT16/Purple/Dinobeemon_BT16_077.cs

@@ -147,7 +147,7 @@ namespace DCGO.CardEffects.BT16
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect(
-                    "You may play 1 level 5 or lower Digimon with the [Free] trait. Then 1 Digimon gains [Rush] and can attack.",
+                    "You may play 1 level 5 or lower Digimon with the [Free] trait. Then 1 Digimon can gain [Rush] and attack.",
                     CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDescription());
                 cardEffects.Add(activateClass);
@@ -155,7 +155,7 @@ namespace DCGO.CardEffects.BT16
                 string EffectDescription()
                 {
                     return
-                        "[When Digivolving] If DNA digivolving, you may play 1 level 5 or lower Digimon with the [Free] trait from your trash without paying the cost. Then, 1 of your Digimon gains [Rush] for the turn and may attack the player.";
+                        "[When Digivolving] If DNA digivolving, you may play 1 level 5 or lower Digimon with the [Free] trait from your trash without paying the cost. Then, 1 of your Digimon may gain [Rush] for the turn and attack the player.";
                 }
 
                 bool CanUseCondition(Hashtable hashtable)
@@ -267,6 +267,8 @@ namespace DCGO.CardEffects.BT16
                                     defenderCondition: _ => false,
                                     cardEffect: activateClass);
 
+                                selectAttackEffect.SetCanNotSelectNotAttack();
+
                                 yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
                             }
                         }

Assets/CardEffect/EX6/White/Mega_Digimon_Assembly_EX6_072.cs

@@ -24,7 +24,7 @@ namespace DCGO.CardEffects.EX6
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (card.Owner.Enemy.GetBattleAreaDigimons().Count((permanent) => permanent.TopCard.Level == 6) >= 1)
+                    if (card.Owner.Enemy.GetBattleAreaDigimons().Count((permanent) => permanent.TopCard.Level >= 6) >= 1)
                     {
                         return true;
                     }

Assets/CardEffect/EX7/Purple/SeventhFascination_EX7_072.cs

@@ -155,7 +155,7 @@ namespace DCGO.CardEffects.EX7
                         {
                             ActivateClass activateClass1 = new ActivateClass();
                             activateClass1.SetUpICardEffect("Delete 1 of your Digimon", CanUseCondition2, cardSource);
-                            activateClass1.SetUpActivateClass(null, ActivateCoroutine1, -1, false, EffectDiscription1());
+                            activateClass1.SetUpActivateClass(CanActivateCondition2, ActivateCoroutine1, -1, false, EffectDiscription1());
                             cardEffects.Add(activateClass1);
 
                             if (cardSource.PermanentOfThisCard() != null)
@@ -184,6 +184,11 @@ namespace DCGO.CardEffects.EX7
                                 return false;
                             }
 
+                            bool CanActivateCondition2(Hashtable hashtable)
+                            {
+                                return CardEffectCommons.IsExistOnBattleAreaDigimon(cardSource);
+                            }
+
                             IEnumerator ActivateCoroutine1(Hashtable _hashtable)
                             {
                                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))

Assets/CardEffect/EX7/Red/Volcanicdramon_EX7_014.cs

@@ -250,37 +250,37 @@ namespace DCGO.CardEffects.EX7
 
                 bool CanSelectCardToPlayFromHand(CardSource cardSource)
                 {
-                    return CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass) && cardSource.IsDigimon && (cardSource.ContainsTraits("Machine Drago") || cardSource.ContainsTraits("Sky Dragon"));
+                    return CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass) && 
+                            cardSource.IsDigimon && 
+                            (cardSource.ContainsTraits("Machine Drago") || cardSource.ContainsTraits("Sky Dragon"));
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) && CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectCardToPlayFromHand);
+                    return CardEffectCommons.IsExistOnBattleAreaDigimon(card) && 
+                        CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectCardToPlayFromHand);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
                     List<CardSource> selectedCards = new List<CardSource>();
 
-                    SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
+                    SelectHandEffect selectCardEffect = GManager.instance.GetComponent<SelectHandEffect>();
 
                     selectCardEffect.SetUp(
+                        selectPlayer: card.Owner,
                         canTargetCondition: CanSelectCardToPlayFromHand,
                         canTargetCondition_ByPreSelecetedList: null,
                         canEndSelectCondition: null,
-                        canNoSelect: () => true,
-                        selectCardCoroutine: SelectCardCoroutine,
-                        afterSelectCardCoroutine: null,
-                        message: "Select 1 card to play.",
                         maxCount: 1,
+                        canNoSelect: true,
                         canEndNotMax: false,
                         isShowOpponent: true,
-                        mode: SelectCardEffect.Mode.Custom,
-                        root: SelectCardEffect.Root.Hand,
-                        customRootCardList: null,
-                        canLookReverseCard: true,
-                        selectPlayer: card.Owner,
+                        selectCardCoroutine: SelectCardCoroutine,
+                        afterSelectCardCoroutine: null,
+                        mode: SelectHandEffect.Mode.Custom,
                         cardEffect: activateClass);
+                            
 
                     selectCardEffect.SetUpCustomMessage("Select 1 card to play.", "The opponent is selecting 1 card to play.");
                     selectCardEffect.SetUpCustomMessage_ShowCard("Played Card");

Assets/CardEffect/ST19/Yellow/ArisaKinosaki_ST19_14.cs

@@ -59,22 +59,22 @@ namespace DCGO.CardEffects.ST19
                     yield return ContinuousController.instance.StartCoroutine(new SuspendPermanentsClass(
                         new List<Permanent>() { card.PermanentOfThisCard() }, CardEffectCommons.CardEffectHashtable(activateClass)).Tap());
 
-                    List<Permanent> permanents = CardEffectCommons.GetPlayedPermanentsFromEnterFieldHashtable(
+                    List<Permanent> playedPermanents = CardEffectCommons.GetPlayedPermanentsFromEnterFieldHashtable(
                         hashtable: hashtable,
                         rootCondition: null)
                         .Filter(PermanentCondition);
 
 
-                    if (permanents.Count > 0)
+                    if (playedPermanents.Count > 0)
                     {
-                        if(permanents.Count > 1)
+                        if(playedPermanents.Count > 1)
                         {
                             SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
 
                             selectPermanentEffect.SetUp(
                                 selectPlayer: card.Owner,
                                 canTargetCondition: PermanentCondition,
-                                canTargetCondition_ByPreSelecetedList: null,
+                                canTargetCondition_ByPreSelecetedList: CanTargetCondition_ByPreSelecetedList,
                                 canEndSelectCondition: null,
                                 maxCount: 1,
                                 canNoSelect: false,
@@ -85,12 +85,16 @@ namespace DCGO.CardEffects.ST19
                                 cardEffect: activateClass);
 
                             yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
+
+                            bool CanTargetCondition_ByPreSelecetedList(List<Permanent> permanents, Permanent permanent)
+                            {
+                                return playedPermanents.Contains(permanent);
+                            }
                         }
                         else 
                         {
-                            yield return ContinuousController.instance.StartCoroutine(SelectPermanentCoroutine(permanents[0]));
+                            yield return ContinuousController.instance.StartCoroutine(SelectPermanentCoroutine(playedPermanents[0]));
                         }
-                        
                     }
 
                     IEnumerator SelectPermanentCoroutine(Permanent permanent)

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.UntilNextUntap,
+            effectDuration: EffectDuration.UntilOwnerActivePhase,
             activateClass: activateClass,
             condition: CanUseCondition,
             effectName: effectName