From 250869931b7ba19184fe82d499b577f17531b1b6 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 19 Oct 2024 00:25:12 -0400 Subject: [PATCH] text fixes --- Mage.Sets/src/mage/cards/b/BecomeAnonymous.java | 2 +- .../src/mage/cards/d/DragonhawkFatesTempest.java | 11 ++++++----- Mage.Sets/src/mage/cards/p/ParallaxWave.java | 3 ++- .../effects/common/ExileTopXMayPlayUntilEffect.java | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Mage.Sets/src/mage/cards/b/BecomeAnonymous.java b/Mage.Sets/src/mage/cards/b/BecomeAnonymous.java index 27e56fc651b..426814cdfa1 100644 --- a/Mage.Sets/src/mage/cards/b/BecomeAnonymous.java +++ b/Mage.Sets/src/mage/cards/b/BecomeAnonymous.java @@ -54,7 +54,7 @@ class BecomeAnonymousEffect extends OneShotEffect { BecomeAnonymousEffect() { super(Outcome.Benefit); staticText = "exile target nontoken creature you own and the top two cards of your library in " + - "a face-down pile, shuffle that pile, then cloak those cards. They enter the battlefield tapped"; + "a face-down pile, shuffle that pile, then cloak those cards. They enter tapped"; } private BecomeAnonymousEffect(final BecomeAnonymousEffect effect) { diff --git a/Mage.Sets/src/mage/cards/d/DragonhawkFatesTempest.java b/Mage.Sets/src/mage/cards/d/DragonhawkFatesTempest.java index 4c4cb511396..23c594dd194 100644 --- a/Mage.Sets/src/mage/cards/d/DragonhawkFatesTempest.java +++ b/Mage.Sets/src/mage/cards/d/DragonhawkFatesTempest.java @@ -48,8 +48,7 @@ public final class DragonhawkFatesTempest extends CardImpl { // Whenever Dragonhawk enters or attacks, exile the top X cards of your library, where X is the number of creatures you control with power 4 or greater. You may play those cards until your next end step. // At the beginning of your next end step, Dragonhawk deals 2 damage to each opponent for each of those cards that are still exiled. this.addAbility(new EntersBattlefieldOrAttacksSourceTriggeredAbility(new DragonhawkExileEffect( - new PermanentsOnBattlefieldCount(filter, null), Duration.UntilYourNextEndStep) - .withTextOptions("those cards", true))); + new PermanentsOnBattlefieldCount(filter, null), Duration.UntilYourNextEndStep))); } private DragonhawkFatesTempest(final DragonhawkFatesTempest card) { @@ -62,11 +61,11 @@ public final class DragonhawkFatesTempest extends CardImpl { } } -// Copied from ExileTopXMayPlayUntilEffect but with addDelayedTriggeredAbility class DragonhawkExileEffect extends ExileTopXMayPlayUntilEffect { - public DragonhawkExileEffect(DynamicValue amount, Duration duration) { + DragonhawkExileEffect(DynamicValue amount, Duration duration) { super(amount, duration); + this.withTextOptions("those cards", true); staticText += ". At the beginning of your next end step, " + DragonhawkFatesTempestDamageEffect.STATIC_TEXT; } @@ -79,6 +78,7 @@ class DragonhawkExileEffect extends ExileTopXMayPlayUntilEffect { return new DragonhawkExileEffect(this); } + @Override protected void effectCards(Game game, Ability source, Set cards) { game.addDelayedTriggeredAbility(new AtTheBeginOfNextEndStepDelayedTriggeredAbility( new DragonhawkFatesTempestDamageEffect(new FixedTargets(cards, game)), TargetController.YOU), source); @@ -86,8 +86,9 @@ class DragonhawkExileEffect extends ExileTopXMayPlayUntilEffect { } class DragonhawkFatesTempestDamageEffect extends OneShotEffect { + FixedTargets cards; - public static String STATIC_TEXT = "{this} deals 2 damage to each opponent for each of those cards that are still exiled"; + public static final String STATIC_TEXT = "{this} deals 2 damage to each opponent for each of those cards that are still exiled"; DragonhawkFatesTempestDamageEffect(FixedTargets cards) { super(Outcome.Benefit); diff --git a/Mage.Sets/src/mage/cards/p/ParallaxWave.java b/Mage.Sets/src/mage/cards/p/ParallaxWave.java index 0da908c0f7c..98799688b86 100644 --- a/Mage.Sets/src/mage/cards/p/ParallaxWave.java +++ b/Mage.Sets/src/mage/cards/p/ParallaxWave.java @@ -35,7 +35,8 @@ public final class ParallaxWave extends CardImpl { this.addAbility(ability); // When Parallax Wave leaves the battlefield, each player returns to the battlefield all cards they own exiled with Parallax Wave. - this.addAbility(new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD), false)); + this.addAbility(new LeavesBattlefieldTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD) + .setText("each player returns to the battlefield all cards they own exiled with {this}"), false)); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileTopXMayPlayUntilEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileTopXMayPlayUntilEffect.java index 23ff219ca5a..36a01e5595e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileTopXMayPlayUntilEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileTopXMayPlayUntilEffect.java @@ -81,7 +81,7 @@ public class ExileTopXMayPlayUntilEffect extends OneShotEffect { String text = "exile the top "; boolean singular = amount.toString().equals("1"); text += singular ? "card" : CardUtil.numberToText(amount.toString()) + " cards"; - if (amount.toString().equals("X")) { + if (amount.toString().equals("X") && !amount.getMessage().isEmpty()) { text += " of your library, where X is " + amount.getMessage() + ". "; } else { text += " of your library. ";