Parcourir la source

Sybareangoramon, gammamon LM fixes

mbunch_kascope il y a 2 ans
Parent
commit
b5d84976fa

+ 5 - 0
Assets/CardEffect/LM/Green/SymbareAngoramon_LM_011.cs

@@ -41,6 +41,11 @@ namespace DCGO.CardEffects.LM
 
                 bool HasNoUnsuspendDigimon()
                 {
+                    if (card.Owner.Enemy.GetBattleAreaDigimons().Count == 0)
+                    {
+                        return true;
+                    } 
+
                     foreach (Permanent permanent in card.Owner.Enemy.GetBattleAreaDigimons())
                     {
                         if (!permanent.IsSuspended)

+ 13 - 2
Assets/CardEffect/LM/Purple/Gammamon_LM_016.cs

@@ -35,7 +35,15 @@ namespace DCGO.CardEffects.LM
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    return cardSource.HasText("Gammamon");
+                    if (cardSource.HasText("Gammamon"))
+                    {
+                        if (cardSource.CanPlayCardTargetFrame(card.PermanentOfThisCard().PermanentFrame, true, activateClass))
+                        {
+                            return true;
+                        }
+                    }
+                    
+                    return false;
                 }
 
                 bool PermanentCondition(Permanent permanent)
@@ -78,7 +86,9 @@ namespace DCGO.CardEffects.LM
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 {
-                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DigivolveIntoHandOrTrashCard(
+                    if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition))
+                    {
+                        yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DigivolveIntoHandOrTrashCard(
                         targetPermanent: card.PermanentOfThisCard(),
                         cardCondition: CanSelectCardCondition,
                         payCost: false,
@@ -88,6 +98,7 @@ namespace DCGO.CardEffects.LM
                         isHand: false,
                         activateClass: activateClass,
                         successProcess: null));
+                    }
                 }
             }
             #endregion