Browse Source

fix to hybrids, and drimogemon

mbunch_kascope 2 years ago
parent
commit
59ba4401f4

+ 1 - 2
Assets/CardEffect/P/Green/Drimogemon_P_143.cs

@@ -50,8 +50,7 @@ namespace DCGO.CardEffects.P
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
-                    yield return ContinuousController.instance.StartCoroutine(new IUnsuspendPermanents(new List<Permanent>() { card.PermanentOfThisCard() }, activateClass).Unsuspend());
-                    yield return ContinuousController.instance.StartCoroutine(CardObjectController.MovePermanent(card.PermanentOfThisCard().PermanentFrame));
+                    yield return ContinuousController.instance.StartCoroutine(CardObjectController.MovePermanent(card.PermanentOfThisCard().PermanentFrame,true));
                 }
             }
             #endregion

+ 3 - 8
Assets/Scripts/CardObjectController.cs

@@ -986,7 +986,7 @@ public class CardObjectController : MonoBehaviour
     #endregion
 
     #region move permanent
-    public static IEnumerator MovePermanent(FieldCardFrame movingPermanentFrame)
+    public static IEnumerator MovePermanent(FieldCardFrame movingPermanentFrame, bool toBreeding = false)
     {
         if (movingPermanentFrame != null)
         {
@@ -999,14 +999,9 @@ public class CardObjectController : MonoBehaviour
                 bool prevIsFrontLine = movingPermanentFrame.IsBattleAreaFrame();
                 FieldCardFrame moveTargetFrame = movingPermanent.TopCard.PreferredFrame();
 
-                if (prevIsFrontLine)
-                {
+                if (toBreeding)
                     moveTargetFrame = player.fieldCardFrames.Filter(frame => frame.isBreedingAreaFrame()).ToList()[0];
-                }
-                else
-                {
-                    moveTargetFrame = movingPermanent.TopCard.PreferredFrame();
-                }
+
    
                 if (moveTargetFrame != null && moveTargetFrame != null)
                 {