Argomon (Mega), Parrotmon, Wilis, Paladin mode, Treated level

Assets/CardEffect/BT17/Green/Argomon_BT17_051.cs

@@ -36,7 +36,7 @@ namespace DCGO.CardEffects.BT17
 
             bool IsLevel5orLowerArgomon(CardSource source)
             {
-                if (source.IsDigimon)
+                if (source.IsDigimon || source.IsDigiEgg)
                 {
                     if (source.HasLevel && source.Level <= 5)
                     {
@@ -94,7 +94,7 @@ namespace DCGO.CardEffects.BT17
                 {
                     if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, IsLevel5orLowerArgomon))
                     {
-                        int maxCount = Math.Min(1, CardEffectCommons.MatchConditionOpponentsCardCountInTrash(card,IsLevel5orLowerArgomon));
+                        int maxCount = Math.Min(4, CardEffectCommons.MatchConditionOpponentsCardCountInTrash(card,IsLevel5orLowerArgomon));
 
                         SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
 
@@ -107,7 +107,7 @@ namespace DCGO.CardEffects.BT17
                         afterSelectCardCoroutine: AfterSelectCardCoroutine,
                         message: "Select cards to place as the bottom digivolution sources",
                         maxCount: maxCount,
-                        canEndNotMax: false,
+                        canEndNotMax: true,
                         isShowOpponent: false,
                         mode: SelectCardEffect.Mode.Custom,
                         root: SelectCardEffect.Root.Trash,
@@ -222,7 +222,7 @@ namespace DCGO.CardEffects.BT17
                 {
                     if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, IsLevel5orLowerArgomon))
                     {
-                        int maxCount = Math.Min(1, CardEffectCommons.MatchConditionOpponentsCardCountInTrash(card, IsLevel5orLowerArgomon));
+                        int maxCount = Math.Min(4, CardEffectCommons.MatchConditionOpponentsCardCountInTrash(card, IsLevel5orLowerArgomon));
 
                         SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
 
@@ -235,7 +235,7 @@ namespace DCGO.CardEffects.BT17
                         afterSelectCardCoroutine: AfterSelectCardCoroutine,
                         message: "Select cards to place as the bottom digivolution sources",
                         maxCount: maxCount,
-                        canEndNotMax: false,
+                        canEndNotMax: true,
                         isShowOpponent: false,
                         mode: SelectCardEffect.Mode.Custom,
                         root: SelectCardEffect.Root.Trash,
@@ -333,13 +333,8 @@ namespace DCGO.CardEffects.BT17
 
                 bool Condition()
                 {
-                    if (CardEffectCommons.IsOwnerTurn(card))
-                    {
-                        if (count() >= 1)
-                        {
-                            return true;
-                        }
-                    }
+                    if (count() >= 1)
+                        return true;
 
                     return false;
                 }

Assets/CardEffect/BT17/Green/Parrotmon_BT17_047.cs

@@ -22,7 +22,7 @@ namespace DCGO.CardEffects.BT17
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Suspend 1 Opponent's Digimon", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
@@ -85,7 +85,7 @@ namespace DCGO.CardEffects.BT17
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Suspend 1 Opponent's Digimon", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()

Assets/CardEffect/BT17/Green/Willis_BT17_088.cs

@@ -261,7 +261,18 @@ namespace DCGO.CardEffects.BT17
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersHand(card, DigivolvePermanentCondition))
                         {
-                            int maxCount = Math.Min(1, card.Owner.HandCards.Count(DigivolvePermanentCondition));
+                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DigivolveIntoHandOrTrashCard(
+                                        targetPermanent: selectedPermanent,
+                                        cardCondition: DigivolvePermanentCondition,
+                                        payCost: true,
+                                        reduceCostTuple: (reduceCost: 2, reduceCostCardCondition: null),
+                                        fixedCostTuple: null,
+                                        ignoreDigivolutionRequirementFixedCost: -1,
+                                        isHand: true,
+                                        activateClass: activateClass,
+                                        successProcess: null));
+
+                            /*int maxCount = Math.Min(1, card.Owner.HandCards.Count(DigivolvePermanentCondition));
 
                             SelectHandEffect selectHandEffect = GManager.instance.GetComponent<SelectHandEffect>();
 
@@ -279,26 +290,17 @@ namespace DCGO.CardEffects.BT17
                                 mode: SelectHandEffect.Mode.Custom,
                                 cardEffect: activateClass);
 
-                            selectHandEffect.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.");
+                            selectHandEffect.SetUpCustomMessage("Select 1 card to digivolve into.", "The opponent is selecting 1 card to digivolve into.");
 
-                            yield return StartCoroutine(selectHandEffect.Activate());
+                            yield return ContinuousController.instance.StartCoroutine(selectHandEffect.Activate());
 
                             IEnumerator SelectCardCoroutine(CardSource cardSource)
                             {
                                 if(cardSource != null)
                                 {
-                                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DigivolveIntoHandOrTrashCard(
-                                        targetPermanent: card.PermanentOfThisCard(),
-                                        cardCondition: DigivolvePermanentCondition,
-                                        payCost: true,
-                                        reduceCostTuple: (reduceCost: 2, reduceCostCardCondition: null),
-                                        fixedCostTuple: null,
-                                        ignoreDigivolutionRequirementFixedCost: -1,
-                                        isHand: true,
-                                        activateClass: activateClass,
-                                        successProcess: null));
+                                    
                                 }
-                            }
+                            }*/
                         }
                     }
                 }

Assets/CardEffect/BT17/White/ImperialdramonPaladinMode_BT17_077.cs

@@ -76,7 +76,7 @@ namespace DCGO.CardEffects.BT17
 
                 bool IsOpponentsDigimon(Permanent permanent)
                 {
-                    if(CardEffectCommons.IsOpponentPermanent(permanent, card))
+                    if(CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card))
                         return permanent.DigivolutionCards.Count == 0;
 
                     return false;
@@ -87,7 +87,7 @@ namespace DCGO.CardEffects.BT17
                     if (CardEffectCommons.CanTriggerOnAttack(hashtable, card))
                         return CardEffectCommons.HasMatchConditionPermanent(IsOpponentsDigimon);
 
-                    return true;
+                    return false;
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
@@ -120,11 +120,11 @@ namespace DCGO.CardEffects.BT17
 
                         yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
 
-                        IEnumerator SelectedBottomDeck(List<Permanent> untappedPermanents)
+                        IEnumerator SelectedBottomDeck(List<Permanent> bottomDeckedPermanents)
                         {
-                            if(untappedPermanents.Count > 0)
+                            if(bottomDeckedPermanents.Count > 0)
                                 yield return ContinuousController.instance.StartCoroutine(new IUnsuspendPermanents(
-                                    untappedPermanents,
+                                    new List<Permanent> { card.PermanentOfThisCard() },
                                     activateClass).Unsuspend());
                         }
                     }

Assets/Scripts/CardObjectController.cs

@@ -878,7 +878,7 @@ public class CardObjectController : MonoBehaviour
             }
         }
 
-        foreach (CardSource cardSource in cardSources)
+        foreach (CardSource cardSource in cardSources.Clone())
         {
             bool isFromHand = CardEffectCommons.IsExistOnHand(cardSource);
 

Assets/Scripts/CardSource.cs

@@ -664,7 +664,7 @@ public class CardSource : MonoBehaviour
     #endregion
 
     #region level
-    public int Level => _cEntity_Base.Level;
+    public int Level => TreatedLevel;
     #endregion
 
     #region Level
@@ -674,7 +674,7 @@ public class CardSource : MonoBehaviour
         {
             int treatedLevel = 0;
 
-            treatedLevel = Level;
+            treatedLevel = _cEntity_Base.Level;
 
             if (!HasLevel)
                 treatedLevel = 1145140;