mbunch_kascope 11 месяцев назад
Родитель
Сommit
2cd2c5eea9

+ 1 - 0
Assets/CardEffect/EX10/Green/EX10_022.cs

@@ -55,6 +55,7 @@ namespace DCGO.CardEffects.EX10
                 bool CanSelectPermanentCondition(Permanent permanent)
                 {
                     return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card) &&
+                           !permanent.TopCard.CanNotBeAffected(activateClass) &&
                            permanent.TopCard.HasLevel && permanent.TopCard.Level <= 5;
                 }
 

+ 2 - 2
Assets/CardEffect/EX10/Purple/EX10_055.cs

@@ -85,7 +85,7 @@ namespace DCGO.CardEffects.EX10
 
                 string EffectDiscription()
                 {
-                    return "[On Play] You may choose 1 of your Digimon. Delete the chosen Digimon and 1 of your opponents Digimon with as high or lower a level as it.";
+                    return "[On Play] You may choose 1 of your Digimon. Delete the chosen Digimon and 1 of your opponent's Digimon with as high or lower a level as it.";
                 }
 
                 bool CanUseCondition(Hashtable hashtable)
@@ -329,7 +329,7 @@ namespace DCGO.CardEffects.EX10
                 {
                     return CardEffectCommons.IsExistOnBattleAreaDigimon(card)
                         && CardEffectCommons.CanTriggerWhenPermanentRemoveField(hashtable, IsBagraArmyDigimon)
-                        && CardEffectCommons.IsByEffect(hashtable, null);
+                        && CardEffectCommons.IsByEffect(hashtable, effect => effect != null);
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)

+ 3 - 6
Assets/CardEffect/EX10/White/EX10_061.cs

@@ -401,7 +401,7 @@ namespace DCGO.CardEffects.EX10
 
                 string EffectDiscription()
                 {
-                    return "[On Play] You may play 1 of each [Dark Masters] trait card with different names from this Digimon's digivolution cards without paying the costs. Then, all of your [Dark Masters] trait Digimon gain <Rush> for the turn. (This Digimon can attack the turn it comes into play.) At turn end, delete the Digimon this effect played.";
+                    return "[On Play] You may play 1 of each [Dark Masters] trait card with different names from this Digimon's digivolution cards without paying the costs. Then, all of your [Dark Masters] trait Digimon gain <Rush> for the turn. At turn end, delete the Digimon this effect played.";
                 }
 
                 bool CanUseCondition(Hashtable hashtable)
@@ -538,14 +538,11 @@ namespace DCGO.CardEffects.EX10
 
                             bool CanUseCondition2(Hashtable hashtable1)
                             {
-                                if (CardEffectCommons.IsOpponentTurn(card))
+                                if (CardEffectCommons.IsOwnerTurn(card))
                                 {
                                     if (CardEffectCommons.IsPermanentExistsOnOwnerBattleArea(selectedPermanent, selectedPermanent.TopCard))
                                     {
-                                        if (CardEffectCommons.CanTriggerOnEndAttack(hashtable1, selectedPermanent.TopCard))
-                                        {
-                                            return true;
-                                        }
+                                        return true;
                                     }
                                 }
 

+ 6 - 7
Assets/CardEffect/EX9/Green/EX9_043.cs

@@ -200,17 +200,16 @@ namespace DCGO.CardEffects.EX9
             {
                 return cardSource.IsDigimon && CardEffectCommons.IsExistOnTrash(cardSource);
             }
-
-            bool CanSelectPermanentDeleteCondition(Permanent permanent)
-            {
-                return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card) &&
-                    permanent.DP <= 3000;
-            }
-
             IEnumerator SharedActivateCoroutine(ActivateClass activateClass)
             {
                 CardSource selectedCard = null;
 
+                bool CanSelectPermanentDeleteCondition(Permanent permanent)
+                {
+                    return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card) &&
+                        permanent.DP <= card.Owner.MaxDP_DeleteEffect(3000, activateClass);
+                }
+
                 if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, SharedCardCondition))
                 {
                     SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();

+ 1 - 1
Assets/Scripts/CardEffectCommons/KeyWordEffects/Collision.cs

@@ -17,7 +17,7 @@ public partial class CardEffectCommons
 
         if (activateClass.EffectSourceCard == null) yield break;
 
-        CardSource card = activateClass.EffectSourceCard;
+        CardSource card = targetPermanent.TopCard;
 
         bool PermanentCondition(Permanent permanent) => permanent == targetPermanent;
 

+ 2 - 1
Assets/Scripts/CardEffectCommons/KeyWordEffects/Fortitude.cs

@@ -25,13 +25,14 @@ public partial class CardEffectCommons
                 {
                     foreach (Hashtable hashtable1 in hashtables)
                     {
+                        Permanent deletedPermanent = CardEffectCommons.GetPermanentFromHashtable(hashtable1);
                         List<CardSource> CardSources = CardEffectCommons.GetCardSourcesFromHashtable(hashtable1);
 
                         if (CardSources != null)
                         {
                             if (CardSources.Contains(card))
                             {
-                                if (CardSources.Count >= 2)
+                                if (deletedPermanent.DigivolutionCards.Count >= 1)
                                 {
                                     if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: card, payCost: false, cardEffect: activateClass, root: SelectCardEffect.Root.Trash))
                                     {