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

+ 2 - 2
Assets/CardEffect/BT10/Black/UndeadKing_BT10_104.cs

@@ -21,7 +21,7 @@ public class UndeadKing_BT10_104 : CEntity_Effect
             bool CanUseCondition(Hashtable hashtable)
             {
                 return card.Owner.GetBattleAreaPermanents().Some(permanet =>
-                    permanet.TopCard.CardNames.Contains("Nene Amano") || permanet.TopCard.CardNames.Contains("NeneAmano"));
+                    permanet.TopCard.EqualsCardName("Nene Amano"));
             }
 
             bool CardCondition(CardSource cardSource)
@@ -44,7 +44,7 @@ public class UndeadKing_BT10_104 : CEntity_Effect
 
             bool CanSelectCardCondition(CardSource cardSource)
             {
-                if (cardSource.ContainsCardName("DarkKnightmon"))
+                if (cardSource.EqualsCardName("DarkKnightmon"))
                 {
                     if (CardEffectCommons.CanPlayAsNewPermanent(
                         cardSource: cardSource,

+ 8 - 4
Assets/CardEffect/BT17/White/Omnimon_BT17_078.cs

@@ -192,7 +192,7 @@ namespace DCGO.CardEffects.BT17
                                 mode: SelectPermanentEffect.Mode.Custom,
                                 cardEffect: activateClass);
 
-                            selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon to destory.", "The opponent is selecting 1 Digimon to destory.");
+                            selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon to bottom deck all of same level.", "The opponent is selecting 1 Digimon to bottom deck all of same level.");
 
                             yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
                         }
@@ -208,7 +208,9 @@ namespace DCGO.CardEffects.BT17
                         if(selectedPermanent.TopCard.HasLevel)
                         {
                             yield return ContinuousController.instance.StartCoroutine(new DeckBottomBounceClass(
-                                deckBounceTargetPermanents: card.Owner.Enemy.GetBattleAreaDigimons().Filter(permanent => permanent.Level == selectedPermanent.Level),
+                                deckBounceTargetPermanents: card.Owner.Enemy.GetBattleAreaDigimons().Filter(permanent => 
+                                permanent.Level == selectedPermanent.Level &&
+                                !permanent.TopCard.CanNotBeAffected(activateClass)),
                                 hashtable: hashtable).DeckBounce());
                         }
                     }
@@ -293,7 +295,7 @@ namespace DCGO.CardEffects.BT17
                                 mode: SelectPermanentEffect.Mode.Custom,
                                 cardEffect: activateClass);
 
-                            selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon to destory.", "The opponent is selecting 1 Digimon to destory.");
+                            selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon to bottom deck all of same level.", "The opponent is selecting 1 Digimon to bottom deck all of same level.");
 
                             yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
                         }
@@ -309,7 +311,9 @@ namespace DCGO.CardEffects.BT17
                         if (selectedPermanent.TopCard.HasLevel)
                         {
                             yield return ContinuousController.instance.StartCoroutine(new DeckBottomBounceClass(
-                                deckBounceTargetPermanents: card.Owner.Enemy.GetBattleAreaDigimons().Filter(permanent => permanent.Level == selectedPermanent.Level),
+                                deckBounceTargetPermanents: card.Owner.Enemy.GetBattleAreaDigimons().Filter(permanent =>
+                                permanent.Level == selectedPermanent.Level &&
+                                !permanent.TopCard.CanNotBeAffected(activateClass)),
                                 hashtable: hashtable).DeckBounce());
                         }
                     }

+ 61 - 64
Assets/CardEffect/P/Black/RookDevice_P_159.cs

@@ -36,81 +36,78 @@ namespace DCGO.CardEffects.P
             #region When Trashed from battle area
             if (timing == EffectTiming.OnDestroyedAnyone)
             {
-                if (timing == EffectTiming.OptionSkill)
+                ActivateClass activateClass = new ActivateClass();
+                activateClass.SetUpICardEffect("Gain Reboot, Blocker, +2000 DP", CanUseCondition, card);
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
+                cardEffects.Add(activateClass);
+
+                string EffectDiscription()
                 {
-                    ActivateClass activateClass = new ActivateClass();
-                    activateClass.SetUpICardEffect("Gain Reboot, Blocker, +2000 DP", CanUseCondition, card);
-                    activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
-                    cardEffects.Add(activateClass);
+                    return "[Main] 1 of your Digimon gains <Reboot>, <Blocker> and gets +2000 DP until the end of your opponent's turn. Then, place this card in the battle area.";
+                }
 
-                    string EffectDiscription()
-                    {
-                        return "[Main] 1 of your Digimon gains <Reboot>, <Blocker> and gets +2000 DP until the end of your opponent's turn. Then, place this card in the battle area.";
-                    }
+                bool HasDigimon(Permanent permanent)
+                {
+                    if (CardEffectCommons.IsOwnerPermanent(permanent, card))
+                        return permanent.IsDigimon;
 
-                    bool HasDigimon(Permanent permanent)
-                    {
-                        if (CardEffectCommons.IsOwnerPermanent(permanent, card))
-                            return permanent.IsDigimon;
+                    return false;
+                }
 
-                        return false;
-                    }
+                bool CanUseCondition(Hashtable hashtable)
+                {
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                }
 
-                    bool CanUseCondition(Hashtable hashtable)
-                    {
-                        return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
-                    }
+                bool CanActivateCondition(Hashtable hashtable)
+                {
+                    return CardEffectCommons.CanActivateOnDeletion(card);
+                }
 
-                    bool CanActivateCondition(Hashtable hashtable)
+                IEnumerator ActivateCoroutine(Hashtable hashtable)
+                {
+                    if (CardEffectCommons.HasMatchConditionPermanent(HasDigimon))
                     {
-                        return CardEffectCommons.CanActivateOnDeletion(card);
-                    }
+                        SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
 
-                    IEnumerator ActivateCoroutine(Hashtable hashtable)
-                    {
-                        if (CardEffectCommons.HasMatchConditionPermanent(HasDigimon))
+                        selectPermanentEffect.SetUp(
+                            selectPlayer: card.Owner,
+                            canTargetCondition: HasDigimon,
+                            canTargetCondition_ByPreSelecetedList: null,
+                            canEndSelectCondition: null,
+                            maxCount: 1,
+                            canNoSelect: false,
+                            canEndNotMax: false,
+                            selectPermanentCoroutine: SelectPermanentCoroutine1,
+                            afterSelectPermanentCoroutine: null,
+                            mode: SelectPermanentEffect.Mode.Custom,
+                            cardEffect: activateClass);
+
+                        selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon that will get Reboot, Blocker, +2000 DP.", "The opponent is selecting 1 Digimon that will get Reboot, Blocker, +2000 DP.");
+
+                        yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
+
+                        IEnumerator SelectPermanentCoroutine1(Permanent permanent)
                         {
-                            SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
-
-                            selectPermanentEffect.SetUp(
-                                selectPlayer: card.Owner,
-                                canTargetCondition: HasDigimon,
-                                canTargetCondition_ByPreSelecetedList: null,
-                                canEndSelectCondition: null,
-                                maxCount: 1,
-                                canNoSelect: false,
-                                canEndNotMax: false,
-                                selectPermanentCoroutine: SelectPermanentCoroutine1,
-                                afterSelectPermanentCoroutine: null,
-                                mode: SelectPermanentEffect.Mode.Custom,
-                                cardEffect: activateClass);
-
-                            selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon that will get Reboot, Blocker, +2000 DP.", "The opponent is selecting 1 Digimon that will get Reboot, Blocker, +2000 DP.");
-
-                            yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
-
-                            IEnumerator SelectPermanentCoroutine1(Permanent permanent)
-                            {
-                                yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainReboot(
-                                    targetPermanent: permanent,
-                                    effectDuration: EffectDuration.UntilOpponentTurnEnd,
-                                    activateClass: activateClass));
-
-                                yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainBlocker(
-                                    targetPermanent: permanent,
-                                    effectDuration: EffectDuration.UntilOpponentTurnEnd,
-                                    activateClass: activateClass));
-
-                                yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonDP(
-                                    targetPermanent: permanent,
-                                    changeValue: 2000,
-                                    effectDuration: EffectDuration.UntilOpponentTurnEnd,
-                                    activateClass: activateClass));
-                            }
-                        }
+                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainReboot(
+                                targetPermanent: permanent,
+                                effectDuration: EffectDuration.UntilOpponentTurnEnd,
+                                activateClass: activateClass));
+
+                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.GainBlocker(
+                                targetPermanent: permanent,
+                                effectDuration: EffectDuration.UntilOpponentTurnEnd,
+                                activateClass: activateClass));
 
-                        yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.PlaceDelayOptionCards(card: card, cardEffect: activateClass));
+                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonDP(
+                                targetPermanent: permanent,
+                                changeValue: 2000,
+                                effectDuration: EffectDuration.UntilOpponentTurnEnd,
+                                activateClass: activateClass));
+                        }
                     }
+
+                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.PlaceDelayOptionCards(card: card, cardEffect: activateClass));
                 }
             }
             #endregion

+ 1 - 1
Assets/CardEffect/P/Red/PawnDevice_P_155.cs

@@ -108,7 +108,7 @@ namespace DCGO.CardEffects.P
                             canTargetCondition_ByPreSelecetedList: null,
                             canEndSelectCondition: null,
                             maxCount: 1,
-                            canNoSelect: false,
+                            canNoSelect: true,
                             canEndNotMax: false,
                             selectPermanentCoroutine: SelectPermanentCoroutine,
                             afterSelectPermanentCoroutine: null,

+ 2 - 2
Assets/CardEffect/P/White/JeriFake_P_158.cs

@@ -143,8 +143,8 @@ namespace DCGO.CardEffects.P
                                 cardEffect: activateClass);
 
                             selectHandEffect.SetUpCustomMessage(
-                                "Select 1 tamer to play.",
-                                "The opponent is selecting 1 tamer to play.");
+                                "Select 1 Digimon to play.",
+                                "The opponent is selecting 1 Digimon to play.");
 
                             yield return StartCoroutine(selectHandEffect.Activate());
 

+ 1 - 1
ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02abfc7ecbe35ae50df63b5d72f98d90e45511c8160df9a257cc46564cac837e
+oid sha256:99685f2b9e0dca82c86dde0e58ba06cb88f8d0dbbd1eb8f3d9c4093c64bea6d4
 size 20167