mbunch_kascope 2 лет назад
Родитель
Сommit
1a168ddf25

+ 4 - 7
Assets/CardEffect/EX6/Purple/Belphemon_Rage_Mode_EX6_060.cs

@@ -32,7 +32,7 @@ namespace DCGO.CardEffects.EX6
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Trash up to 3 cards, suspend 1 opponent's digimon. Then delete all opponents suspended digimon with lowest play cost.", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
@@ -59,12 +59,9 @@ namespace DCGO.CardEffects.EX6
                 {
                     if (CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card))
                     {
-                        if (permanent.IsSuspended)
+                        if (CardEffectCommons.IsMinCost(permanent, card.Owner.Enemy, true, (permanent) => permanent.IsSuspended))
                         {
-                            if (CardEffectCommons.IsMinCost(permanent, card.Owner.Enemy, true))
-                            {
-                                return true;
-                            }
+                            return true;
                         }
                     }
 
@@ -147,7 +144,7 @@ namespace DCGO.CardEffects.EX6
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Trash up to 3 cards, suspend 1 opponent's digimon. Then delete all opponents suspended digimon with lowest play cost.", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()

+ 1 - 1
Assets/CardEffect/ST17/Green/Rapidmon_ST17_07.cs

@@ -155,7 +155,7 @@ namespace DCGO.CardEffects.ST17
 
                 string EffectDiscription()
                 {
-                    return "[On Play] [De-Digivolve] 1 of your opponent's Digimon. Then, if you have a green Tamer, until the end of your opponent's turn, your opponent's effects can't delete this Digimon or return it to the hand or deck.";
+                    return "[When Digivolving] [De-Digivolve] 1 of your opponent's Digimon. Then, if you have a green Tamer, until the end of your opponent's turn, your opponent's effects can't delete this Digimon or return it to the hand or deck.";
                 }
 
                 bool CanSelectPermanentCondition(Permanent permanent)

+ 6 - 4
Assets/Scripts/CardEffectCommons/MinMax_DP_Cost_Level/Cost/IsMinCost.cs

@@ -22,14 +22,16 @@ public partial class CardEffectCommons
 
         if (IsDigimonOnly)
         {
-            costs = permanent.TopCard.Owner.GetBattleAreaPermanents().Filter(permanent1 =>
-                permanent1.IsDigimon && permanent1.TopCard.HasPlayCost)
+            costs = permanent.TopCard.Owner.GetBattleAreaPermanents()
+                .Filter(permanent1 => condition != null && condition(permanent1))
+                .Filter(permanent1 => permanent1.IsDigimon && permanent1.TopCard.HasPlayCost)
                 .Map(permanent1 => permanent1.TopCard.GetCostItself);
         }
         else
         {
-            costs = permanent.TopCard.Owner.GetBattleAreaPermanents().Filter(permanent1 =>
-                (permanent1.IsDigimon || permanent1.IsTamer) && permanent1.TopCard.HasPlayCost)
+            costs = permanent.TopCard.Owner.GetBattleAreaPermanents()
+                .Filter(permanent1 => condition != null && condition(permanent1))
+                .Filter(permanent1 => (permanent1.IsDigimon || permanent1.IsTamer) && permanent1.TopCard.HasPlayCost)
                 .Map(permanent1 => permanent1.TopCard.GetCostItself);
         }
 

+ 2 - 1
Assets/Scripts/CardEffectCommons/MinMax_DP_Cost_Level/DP/IsMinDP.cs

@@ -13,10 +13,11 @@ public partial class CardEffectCommons
         if (permanent.TopCard == null) return false;
         if (permanent.TopCard.Owner != owner) return false;
         if (!IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, permanent.TopCard)) return false;
-        if(condition != null && !condition(permanent)) return false;
+        if (condition != null && !condition(permanent)) return false;
         if (!permanent.TopCard.HasDP && (permanent.BaseDP <= 0)) return false;
 
         List<int> DPs = permanent.TopCard.Owner.GetBattleAreaDigimons()
+            .Filter(permanent1 => condition != null && condition(permanent1))
             .Filter(permanent1 => permanent1.TopCard.HasDP || (permanent1.BaseDP > 0))
             .Map(permanent1 => permanent1.DP);
 

+ 1 - 1
ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e46cedf0e3cdbefba3841d55bb7fd0887bdba8de022e040a1635a136d658b8b
+oid sha256:9d0472c318346e5792949383b04fa4d8fed45ca4866016cda7b77eac38dd4350
 size 20166