1.8.5.9 build

Assets/CardEffect/BT15/Black/BT15_058.cs

@@ -49,7 +49,7 @@ namespace DCGO.CardEffects.BT15
 
                 string EffectDiscription()
                 {
-                    return "[All Turns][Once per turn] When this Digimon becomes suspened, suspened 1 of your opponent's Digimon or Tamers with a play cost less than or equal to this Digimon.";
+                    return "[All Turns] [Once Per Turn] When this Digimon becomes suspended, suspend 1 of your opponent's Digimon or Tamers with a play cost less than or equal to this Digimon's play cost.";
                 }
 
                 bool CanSelectPermanentCondition(Permanent permanent)

Assets/CardEffect/EX7/Black/EX7_043.cs

@@ -286,7 +286,7 @@ namespace DCGO.CardEffects.EX7
                                     selectHandEffect.SetUp(
                                         selectPlayer: card.Owner,
                                         canTargetCondition: CanSelectCardSharedCondition,
-                                        canTargetCondition_ByPreSelecetedList: null,
+                                        canTargetCondition_ByPreSelecetedList: CanTargetCondition_ByPreSelecetedList,
                                         canEndSelectCondition: null,
                                         maxCount: allowedCount,
                                         canNoSelect: true,
@@ -310,7 +310,7 @@ namespace DCGO.CardEffects.EX7
 
                                     selectCardEffect.SetUp(
                                         canTargetCondition: CanSelectCardSharedCondition,
-                                        canTargetCondition_ByPreSelecetedList: null,
+                                        canTargetCondition_ByPreSelecetedList: CanTargetCondition_ByPreSelecetedList,
                                         canEndSelectCondition: null,
                                         canNoSelect: () => true,
                                         selectCardCoroutine: null,
@@ -334,6 +334,16 @@ namespace DCGO.CardEffects.EX7
                                     yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
                                 }
 
+                                bool CanTargetCondition_ByPreSelecetedList(List<CardSource> cardSources, CardSource cardSource)
+                                {
+                                    if (cardSources.Contains(cardSource))
+                                    {
+                                        return false;
+                                    }
+
+                                    return true;
+                                }
+
                                 IEnumerator AfterSelectCardCoroutine(List<CardSource> cardSources)
                                 {
                                     selectedCards.AddRange(cardSources);
@@ -343,7 +353,7 @@ namespace DCGO.CardEffects.EX7
                                         cardSources.Reverse();
 
                                         yield return ContinuousController.instance.StartCoroutine(
-                                            CardObjectController.AddLibraryTopCards(cardSources));
+                                            CardObjectController.AddLibraryTopCards(selectedCards));
 
                                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentSharedCondition))
                                         {

Assets/CardEffect/EX8/Black/EX8_053.cs

@@ -86,15 +86,23 @@ namespace DCGO.CardEffects.EX8
                 {
                     List<CardSource> selectedCards = new List<CardSource>();
 
-                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.RevealDeckTopCardsAndProcessForAll(
+                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.RevealDeckTopCardsAndSelect(
                         revealCount: 3,
-                        simplifiedSelectCardCondition:
-                        new SimplifiedSelectCardConditionClass(
-                            canTargetCondition: PlayableMineralorRock,
-                            message: "Select 1 [Mineral] or [Rock] trait digimon with 8 cost or less to play",
-                            mode: SelectCardEffect.Mode.Custom,
-                            maxCount: -1,
-                            selectCardCoroutine: CardToPlay),
+                        selectCardConditions:
+                        new SelectCardConditionClass[]
+                        {
+                            new SelectCardConditionClass(
+                                canTargetCondition: PlayableMineralorRock,
+                                canTargetCondition_ByPreSelecetedList: null,
+                                canEndSelectCondition: null,
+                                canNoSelect: false,
+                                selectCardCoroutine: CardToPlay,
+                                message: "Select 1 [Mineral] or [Rock] trait digimon with 8 cost or less to play",
+                                maxCount: 1,
+                                canEndNotMax: false,
+                                mode: SelectCardEffect.Mode.Custom
+                                )
+                        },                        
                         remainingCardsPlace: RemainingCardsPlace.Trash,
                         activateClass: activateClass
                     ));

Assets/CardEffect/P/Green/P_143.cs

@@ -50,7 +50,7 @@ namespace DCGO.CardEffects.P
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
-                    if(GManager.instance.turnStateMachine.gameContext.TurnPlayer.CanMove)
+                    if(card.PermanentOfThisCard().CanMove)
                         yield return ContinuousController.instance.StartCoroutine(CardObjectController.MovePermanent(card.PermanentOfThisCard().PermanentFrame,true));
                 }
             }

Assets/Scripts/Permanent.cs

@@ -1825,9 +1825,17 @@ public class Permanent
                 }
                 #endregion
 
-                if (!TopCard.Owner.GetBreedingAreaPermanents().Contains(this))
+                if (TopCard.PermanentOfThisCard().PermanentFrame.isBreedingAreaFrame())
                 {
-                    return false;
+                    if (!TopCard.Owner.GetBreedingAreaPermanents().Contains(this))
+                    {
+                        return false;
+                    }
+                }
+                else
+                {
+                    if (TopCard.Owner.GetBreedingAreaPermanents().Count > 0)
+                        return false;
                 }
 
                 if (!IsDigimon)
@@ -1841,7 +1849,6 @@ public class Permanent
                     return false;
                 }
             }
-
             else
             {
                 return false;

ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:705aa364a2ca562e176d02d321fe1b50a016a803b5c29c1a174215a2a136f0ab
+oid sha256:41f0689bfc7934afc465da36581c8e13b7b6f7f5c269c5569f7865e09066ed11
 size 20168