mbunch_kascope 1 год назад
Родитель
Сommit
4f26a75c44

+ 8 - 3
Assets/CardEffect/BT16/Black/DoruGreymon_BT16_061.cs

@@ -163,6 +163,11 @@ namespace DCGO.CardEffects.BT16
                     return (cardEffect.EffectSourceCard.PermanentOfThisCard() == card.PermanentOfThisCard());
                 }
 
+                bool OpponentsPermenantCondition(Permanent permanent)
+                {
+                    return permanent.IsDigimon && CardEffectCommons.IsOpponentPermanent(permanent, card);
+                }
+
                 bool CanUseCondition(Hashtable hashtable)
                 {
                     if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
@@ -176,9 +181,8 @@ namespace DCGO.CardEffects.BT16
 
                                 return permanent.cardSources.Contains(card);
                             }
-                            bool LoserCondition(Permanent permanent) => permanent.IsDigimon && CardEffectCommons.IsOpponentPermanent(permanent, card);
 
-                            if (CardEffectCommons.CanTriggerWhenDeleteOpponentDigimon(hashtable, WinnerCondition, LoserCondition))
+                            if (CardEffectCommons.CanTriggerWhenDeleteOpponentDigimon(hashtable, WinnerCondition, OpponentsPermenantCondition))
                             {
                                 return true;
                             }
@@ -186,7 +190,8 @@ namespace DCGO.CardEffects.BT16
 
                         if(CardEffectCommons.IsByEffect(hashtable, DeletionCardEffect))
                         {
-                            return true;
+                            if(CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, OpponentsPermenantCondition))
+                                return true;
                         }
                     }
 

+ 8 - 6
Assets/CardEffect/BT16/Black/Publimon_BT16_056.cs

@@ -202,19 +202,21 @@ namespace DCGO.CardEffects.BT16
 
                                     if (securityPermanent.DigivolutionCards.Count >= 1)
                                     {
-                                        yield return ContinuousController.instance.StartCoroutine(CardObjectController.RemoveFromAllArea(permanent.TopCard));
+
+                                        yield return ContinuousController.instance.StartCoroutine(CardObjectController.RemoveFromAllArea(securityCard));
 
                                         permanent.ShowingPermanentCard.ShowPermanentData(true);
 
-                                        yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().RemoveDigivolveRootEffect(permanent.TopCard, permanent));
+                                        yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().RemoveDigivolveRootEffect(securityCard, permanent));
 
-                                        if (!permanent.TopCard.IsToken)
+                                        if (!securityCard.IsToken)
                                         {
-                                            yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddSecurityCard(permanent.TopCard, true));
+                                            Player owner = securityCard.Owner;
+                                            yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddSecurityCard(securityCard, true));
 
-                                            yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateRecoveryEffect(permanent.TopCard.Owner));
+                                            yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateRecoveryEffect(owner));
 
-                                            yield return ContinuousController.instance.StartCoroutine(new IAddSecurity(permanent.TopCard.Owner).AddSecurity());
+                                            yield return ContinuousController.instance.StartCoroutine(new IAddSecurity(owner).AddSecurity());
 
                                             permanent.willBeRemoveField = false;
 

+ 2 - 2
Assets/CardEffect/BT17/White/Omnimon_BT17_078.cs

@@ -300,13 +300,13 @@ namespace DCGO.CardEffects.BT17
 
                         IEnumerator SelectPermanentLevelCoroutine(Permanent permanent)
                         {
-                            if (permanent != null)
+                            if (permanent != null && permanent.TopCard.HasLevel)
                                 selectedLevel = permanent.Level;
 
                             yield return null;
                         }
 
-                        if (selectedLevel > 0)
+                        if (selectedLevel > 2)
                         {
                             yield return ContinuousController.instance.StartCoroutine(new DeckBottomBounceClass(
                                 deckBounceTargetPermanents: card.Owner.Enemy.GetBattleAreaDigimons().Filter(permanent => permanent.Level == selectedLevel && !permanent.TopCard.CanNotBeAffected(activateClass)),