From 2b5650bdfe383c6f0918fdb6afe58a723650c08f Mon Sep 17 00:00:00 2001 From: theelk801 Date: Sat, 12 Jul 2025 12:03:44 -0400 Subject: [PATCH] [EOC] some text fixes --- Mage.Sets/src/mage/cards/b/BalothPrime.java | 6 ++-- .../src/mage/cards/l/LongRangeSensor.java | 2 +- .../src/mage/cards/m/MoxiteRefinery.java | 1 + .../src/mage/cards/p/PestInfestation.java | 2 +- .../src/mage/cards/p/PhyrexianMetamorph.java | 34 +++++++++---------- 5 files changed, 23 insertions(+), 22 deletions(-) diff --git a/Mage.Sets/src/mage/cards/b/BalothPrime.java b/Mage.Sets/src/mage/cards/b/BalothPrime.java index 184cfe35a7f..36f0ce7a90a 100644 --- a/Mage.Sets/src/mage/cards/b/BalothPrime.java +++ b/Mage.Sets/src/mage/cards/b/BalothPrime.java @@ -36,7 +36,7 @@ public final class BalothPrime extends CardImpl { // This creature enters tapped with six stun counters on it. (If a permanent with a stun counter would become untapped, remove one from it instead.) Ability ability = new EntersBattlefieldAbility( - new TapSourceEffect(true), "tapped with a stun counter on it. " + new TapSourceEffect(true), "tapped with six stun counters on it. " + "(If a permanent with a stun counter would become untapped, remove one from it instead.)" ); ability.addEffect(new AddCountersSourceEffect(CounterType.STUN.createInstance(6))); @@ -44,7 +44,7 @@ public final class BalothPrime extends CardImpl { // Whenever you sacrifice a land, create a tapped 4/4 green Beast creature token and untap this creature. ability = new SacrificePermanentTriggeredAbility( - new CreateTokenEffect(new BeastToken2()), StaticFilters.FILTER_LAND + new CreateTokenEffect(new BeastToken2(), 1, true), StaticFilters.FILTER_LAND ); ability.addEffect(new UntapSourceEffect().concatBy("and")); this.addAbility(ability); @@ -63,4 +63,4 @@ public final class BalothPrime extends CardImpl { public BalothPrime copy() { return new BalothPrime(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/l/LongRangeSensor.java b/Mage.Sets/src/mage/cards/l/LongRangeSensor.java index 96115da3f5c..0d0dcd91427 100644 --- a/Mage.Sets/src/mage/cards/l/LongRangeSensor.java +++ b/Mage.Sets/src/mage/cards/l/LongRangeSensor.java @@ -30,7 +30,7 @@ public final class LongRangeSensor extends CardImpl { // {1}, Remove two charge counters from this artifact: Discover 4. Activate only as a sorcery. Ability ability = new ActivateAsSorceryActivatedAbility(new DiscoverEffect(4), new GenericManaCost(1)); - ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(2))); + ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(2))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MoxiteRefinery.java b/Mage.Sets/src/mage/cards/m/MoxiteRefinery.java index d7d37d064d3..5add078f33d 100644 --- a/Mage.Sets/src/mage/cards/m/MoxiteRefinery.java +++ b/Mage.Sets/src/mage/cards/m/MoxiteRefinery.java @@ -33,6 +33,7 @@ public final class MoxiteRefinery extends CardImpl { CounterType.CHARGE.createInstance(), GetXValue.instance ), new GenericManaCost(2)).setTiming(TimingRule.SORCERY); ability.addCost(new TapSourceCost()); + // TODO: this cost is not actually the right one to use here ability.addCost(new RemoveVariableCountersTargetCost( StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT_OR_CREATURE, CounterType.CHARGE )); diff --git a/Mage.Sets/src/mage/cards/p/PestInfestation.java b/Mage.Sets/src/mage/cards/p/PestInfestation.java index e41a56e7b2a..ba74767a5a1 100644 --- a/Mage.Sets/src/mage/cards/p/PestInfestation.java +++ b/Mage.Sets/src/mage/cards/p/PestInfestation.java @@ -29,7 +29,7 @@ public final class PestInfestation extends CardImpl { this.getSpellAbility().addEffect(new DestroyTargetEffect() .setText("destroy up to X target artifacts and/or enchantments.")); this.getSpellAbility().addEffect(new CreateTokenEffect(new Pest11GainLifeToken(), xValue) - .setText("Create twice X 1/1 black and green Pest creature tokens with \"When this creature dies, you gain 1 life.\"")); + .setText("Create twice X 1/1 black and green Pest creature tokens with \"When this token dies, you gain 1 life.\"")); this.getSpellAbility().addTarget(new TargetPermanent(0, 1, StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT)); this.getSpellAbility().setTargetAdjuster(new XTargetsCountAdjuster()); } diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianMetamorph.java b/Mage.Sets/src/mage/cards/p/PhyrexianMetamorph.java index 494f4deda07..c7d80d561cb 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianMetamorph.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianMetamorph.java @@ -3,15 +3,12 @@ package mage.cards.p; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; -import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.Effect; -import mage.abilities.effects.EntersBattlefieldEffect; +import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.effects.common.CopyPermanentEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.Zone; import mage.filter.StaticFilters; import mage.game.Game; import mage.util.functions.CopyApplier; @@ -19,11 +16,23 @@ import mage.util.functions.CopyApplier; import java.util.UUID; /** - * * @author Loki */ public final class PhyrexianMetamorph extends CardImpl { + private static final CopyApplier applier = new CopyApplier() { + @Override + public boolean apply(Game game, MageObject blueprint, Ability source, UUID copyToObjectId) { + blueprint.addCardType(CardType.ARTIFACT); + return true; + } + + @Override + public String getText() { + return ", except it's an artifact in addition to its other types"; + } + }; + public PhyrexianMetamorph(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{3}{U/P}"); this.subtype.add(SubType.PHYREXIAN); @@ -32,20 +41,11 @@ public final class PhyrexianMetamorph extends CardImpl { this.power = new MageInt(0); this.toughness = new MageInt(0); - CopyApplier phyrexianMetamorphCopyApplier = new CopyApplier() { - @Override - public boolean apply(Game game, MageObject blueprint, Ability source, UUID copyToObjectId) { - blueprint.addCardType(CardType.ARTIFACT); - return true; - } - }; - // {U/P} ( can be paid with either {U} or 2 life.) // You may have Phyrexian Metamorph enter the battlefield as a copy of any artifact or creature on the battlefield, except it's an artifact in addition to its other types. - Effect effect = new CopyPermanentEffect(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE, phyrexianMetamorphCopyApplier); - effect.setText("You may have {this} enter the battlefield as a copy of any artifact or creature on the battlefield, except it's an artifact in addition to its other types"); - Ability ability = new SimpleStaticAbility(Zone.ALL, new EntersBattlefieldEffect(effect, "", true)); - this.addAbility(ability); + this.addAbility(new EntersBattlefieldAbility(new CopyPermanentEffect( + StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE, applier + ), true)); } private PhyrexianMetamorph(final PhyrexianMetamorph card) {