From 8010ce50e4bb83fcd0305bf7fb44850c8c4caa20 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Thu, 10 Feb 2022 08:53:49 -0500 Subject: [PATCH] [NEC] fixed Myojin ETB effect --- Mage.Sets/src/mage/cards/m/MyojinOfBloomingDawn.java | 9 +++++---- Mage.Sets/src/mage/cards/m/MyojinOfRoaringBlades.java | 9 +++++---- Mage.Sets/src/mage/cards/m/MyojinOfToweringMight.java | 9 +++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfBloomingDawn.java b/Mage.Sets/src/mage/cards/m/MyojinOfBloomingDawn.java index e4f6112e5b..873c8850e0 100644 --- a/Mage.Sets/src/mage/cards/m/MyojinOfBloomingDawn.java +++ b/Mage.Sets/src/mage/cards/m/MyojinOfBloomingDawn.java @@ -5,7 +5,6 @@ import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.CastFromHandSourcePermanentCondition; import mage.abilities.costs.common.RemoveCountersSourceCost; -import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.CreateTokenEffect; @@ -20,6 +19,7 @@ import mage.constants.SuperType; import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.game.permanent.token.SpiritToken; +import mage.watchers.common.CastFromHandWatcher; import java.util.UUID; @@ -40,10 +40,11 @@ public final class MyojinOfBloomingDawn extends CardImpl { this.toughness = new MageInt(6); // Myojin of Blooming Dawn enters the battlefield with an indestructible counter on it if you cast it from your hand. - this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect( + this.addAbility(new EntersBattlefieldAbility( new AddCountersSourceEffect(CounterType.INDESTRUCTIBLE.createInstance()), - CastFromHandSourcePermanentCondition.instance, "" - ), "{this} enters the battlefield with an indestructible counter on it if you cast it from your hand")); + CastFromHandSourcePermanentCondition.instance, null, + "with an indestructible counter on it if you cast it from your hand" + ), new CastFromHandWatcher()); // Remove an indestructible counter from Myojin of Blooming Dawn: Create a 1/1 colorless Spirit creature token for each permanent you control. this.addAbility(new SimpleActivatedAbility( diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfRoaringBlades.java b/Mage.Sets/src/mage/cards/m/MyojinOfRoaringBlades.java index 27e2fe9159..4e44bae6b2 100644 --- a/Mage.Sets/src/mage/cards/m/MyojinOfRoaringBlades.java +++ b/Mage.Sets/src/mage/cards/m/MyojinOfRoaringBlades.java @@ -6,7 +6,6 @@ import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.CastFromHandSourcePermanentCondition; import mage.abilities.costs.common.RemoveCountersSourceCost; -import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; @@ -16,6 +15,7 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.counters.CounterType; import mage.target.common.TargetAnyTarget; +import mage.watchers.common.CastFromHandWatcher; import java.util.UUID; @@ -33,10 +33,11 @@ public final class MyojinOfRoaringBlades extends CardImpl { this.toughness = new MageInt(4); // Myojin of Roaring Blades enters the battlefield with an indestructible counter on it if you cast it from your hand. - this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect( + this.addAbility(new EntersBattlefieldAbility( new AddCountersSourceEffect(CounterType.INDESTRUCTIBLE.createInstance()), - CastFromHandSourcePermanentCondition.instance, "" - ), "{this} enters the battlefield with an indestructible counter on it if you cast it from your hand")); + CastFromHandSourcePermanentCondition.instance, null, + "with an indestructible counter on it if you cast it from your hand" + ), new CastFromHandWatcher()); // Remove an indestructible counter from Myojin of Roaring Blades: It deals 7 damage to each of up to three targets. Ability ability = new SimpleActivatedAbility( diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfToweringMight.java b/Mage.Sets/src/mage/cards/m/MyojinOfToweringMight.java index 53ee55415a..3b2234ad01 100644 --- a/Mage.Sets/src/mage/cards/m/MyojinOfToweringMight.java +++ b/Mage.Sets/src/mage/cards/m/MyojinOfToweringMight.java @@ -6,7 +6,6 @@ import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.CastFromHandSourcePermanentCondition; import mage.abilities.costs.common.RemoveCountersSourceCost; -import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.counter.DistributeCountersEffect; @@ -20,6 +19,7 @@ import mage.constants.SuperType; import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.target.common.TargetCreaturePermanentAmount; +import mage.watchers.common.CastFromHandWatcher; import java.util.UUID; @@ -37,10 +37,11 @@ public final class MyojinOfToweringMight extends CardImpl { this.toughness = new MageInt(8); // Myojin of Towering Might enters the battlefield with an indestructible counter on it if you cast it from your hand. - this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect( + this.addAbility(new EntersBattlefieldAbility( new AddCountersSourceEffect(CounterType.INDESTRUCTIBLE.createInstance()), - CastFromHandSourcePermanentCondition.instance, "" - ), "{this} enters the battlefield with an indestructible counter on it if you cast it from your hand")); + CastFromHandSourcePermanentCondition.instance, null, + "with an indestructible counter on it if you cast it from your hand" + ), new CastFromHandWatcher()); // Remove an indestructible counter from Myojin of Towering Might: Distribute eight +1/+1 counters among any number of target creatures you control. They gain trample until end of turn. Ability ability = new SimpleActivatedAbility(new DistributeCountersEffect(