From bc3240e94d05d7f78b984aca94d5184b92bf1c38 Mon Sep 17 00:00:00 2001 From: xenohedron <12538125+xenohedron@users.noreply.github.com> Date: Tue, 18 Nov 2025 21:06:21 -0500 Subject: [PATCH] some text fixes --- Mage.Sets/src/mage/cards/a/AnotherChance.java | 2 +- Mage.Sets/src/mage/cards/a/ArcTrail.java | 6 +++--- Mage.Sets/src/mage/cards/e/ElectroAssaultingBattery.java | 4 ++-- Mage.Sets/src/mage/cards/e/ExplosiveWelcome.java | 2 +- Mage.Sets/src/mage/cards/i/InvasionOfRegatha.java | 2 +- .../effects/common/DamageTargetAndAllControlledEffect.java | 6 +++--- .../mage/abilities/effects/common/HarnessSourceEffect.java | 2 +- .../search/SearchLibraryForFourDifferentCardsEffect.java | 2 +- Mage/src/main/java/mage/target/TargetImpl.java | 1 + 9 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AnotherChance.java b/Mage.Sets/src/mage/cards/a/AnotherChance.java index 943b1733290..852c2354d48 100644 --- a/Mage.Sets/src/mage/cards/a/AnotherChance.java +++ b/Mage.Sets/src/mage/cards/a/AnotherChance.java @@ -26,7 +26,7 @@ public final class AnotherChance extends CardImpl { // You may mill two cards. Then return up to two creature cards from your graveyard to your hand. this.getSpellAbility().addEffect(new AnotherChanceMillEffect()); this.getSpellAbility().addEffect(new OneShotNonTargetEffect(new ReturnFromGraveyardToHandTargetEffect().setText("Then return up to two creature cards from your graveyard to your hand."), - new TargetCardInYourGraveyard(0, 2, StaticFilters.FILTER_CARD_CREATURES_YOUR_GRAVEYARD, true)).withTargetDescription("up to two creature cards").concatBy("Then ")); + new TargetCardInYourGraveyard(0, 2, StaticFilters.FILTER_CARD_CREATURES_YOUR_GRAVEYARD, true)).withTargetDescription("up to two creature cards")); } private AnotherChance(final AnotherChance card) { diff --git a/Mage.Sets/src/mage/cards/a/ArcTrail.java b/Mage.Sets/src/mage/cards/a/ArcTrail.java index 703e3c7ecf8..e0a9fe36d2d 100644 --- a/Mage.Sets/src/mage/cards/a/ArcTrail.java +++ b/Mage.Sets/src/mage/cards/a/ArcTrail.java @@ -7,6 +7,7 @@ import mage.constants.CardType; import mage.filter.common.FilterAnyTarget; import mage.filter.common.FilterPermanentOrPlayer; import mage.filter.predicate.other.AnotherTargetPredicate; +import mage.target.common.TargetAnyTarget; import mage.target.common.TargetPermanentOrPlayer; import java.util.UUID; @@ -16,8 +17,7 @@ import java.util.UUID; */ public final class ArcTrail extends CardImpl { - private static final FilterPermanentOrPlayer filter1 = new FilterAnyTarget("creature, player or planeswalker to deal 2 damage"); - private static final FilterPermanentOrPlayer filter2 = new FilterAnyTarget("another creature, player or planeswalker to deal 1 damage"); + private static final FilterPermanentOrPlayer filter2 = new FilterAnyTarget("another target"); static { filter2.getPermanentFilter().add(new AnotherTargetPredicate(2)); @@ -29,7 +29,7 @@ public final class ArcTrail extends CardImpl { // Arc Trail deals 2 damage to any target and 1 damage to another target this.getSpellAbility().addEffect(new DamageTargetAndTargetEffect(2, 1)); - this.getSpellAbility().addTarget(new TargetPermanentOrPlayer(filter1) + this.getSpellAbility().addTarget(new TargetAnyTarget() .withChooseHint("to deal 2 damage").setTargetTag(1)); this.getSpellAbility().addTarget(new TargetPermanentOrPlayer(filter2) .withChooseHint("to deal 1 damage").setTargetTag(2)); diff --git a/Mage.Sets/src/mage/cards/e/ElectroAssaultingBattery.java b/Mage.Sets/src/mage/cards/e/ElectroAssaultingBattery.java index 27e33673fd2..d802d3cc68d 100644 --- a/Mage.Sets/src/mage/cards/e/ElectroAssaultingBattery.java +++ b/Mage.Sets/src/mage/cards/e/ElectroAssaultingBattery.java @@ -63,7 +63,7 @@ class ElectroAssaultingBatteryEffect extends OneShotEffect { ElectroAssaultingBatteryEffect() { super(Outcome.Damage); - staticText = "you may pay x. When you do, he deals X damage to target player"; + staticText = "you may pay {X}. When you do, he deals X damage to target player"; } private ElectroAssaultingBatteryEffect(final ElectroAssaultingBatteryEffect effect) { @@ -92,4 +92,4 @@ class ElectroAssaultingBatteryEffect extends OneShotEffect { } return true; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/e/ExplosiveWelcome.java b/Mage.Sets/src/mage/cards/e/ExplosiveWelcome.java index 34d261a336d..fd5faf51be3 100644 --- a/Mage.Sets/src/mage/cards/e/ExplosiveWelcome.java +++ b/Mage.Sets/src/mage/cards/e/ExplosiveWelcome.java @@ -20,7 +20,7 @@ import java.util.UUID; */ public final class ExplosiveWelcome extends CardImpl { - private static final FilterPermanentOrPlayer filter = new FilterAnyTarget(); + private static final FilterPermanentOrPlayer filter = new FilterAnyTarget("any other target"); static { filter.getPermanentFilter().add(new AnotherTargetPredicate(2)); diff --git a/Mage.Sets/src/mage/cards/i/InvasionOfRegatha.java b/Mage.Sets/src/mage/cards/i/InvasionOfRegatha.java index f6068787a4b..4f7ff4dda05 100644 --- a/Mage.Sets/src/mage/cards/i/InvasionOfRegatha.java +++ b/Mage.Sets/src/mage/cards/i/InvasionOfRegatha.java @@ -23,7 +23,7 @@ import java.util.UUID; public final class InvasionOfRegatha extends CardImpl { private static final FilterPermanentOrPlayer filter = new FilterPermanentOrPlayer( - "another target permanent or player", + "another target battle or opponent", new FilterBattlePermanent(), new FilterOpponent() ); diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndAllControlledEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndAllControlledEffect.java index c9c9dbc0f93..61d228d61ea 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndAllControlledEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndAllControlledEffect.java @@ -74,9 +74,9 @@ public class DamageTargetAndAllControlledEffect extends OneShotEffect { return staticText; } String description = getTargetPointer().describeTargets(mode.getTargets(), "that player"); - return "{this} deals " + firstAmount + " damage to " + description + - " and " + secondAmount + " damage to each " + filter.getMessage() + - " that player" + + return "{this} deals " + firstAmount + " damage to " + description + " and " + + ((firstAmount == secondAmount) ? "each " : secondAmount + " damage to each ") + + filter.getMessage() + " that player" + (description.contains("planeswalker") ? " or that planeswalker's controller" : "") + " controls"; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/HarnessSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/HarnessSourceEffect.java index a47aa31f40b..ab93c997e51 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/HarnessSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/HarnessSourceEffect.java @@ -13,7 +13,7 @@ public class HarnessSourceEffect extends OneShotEffect { public HarnessSourceEffect() { super(Outcome.AIDontUseIt); - staticText = "Harness {this}. (Once harnessed, its ∞ ability is active.)"; + staticText = "Harness {this}. (Once harnessed, its ∞ ability is active.)"; } protected HarnessSourceEffect(final HarnessSourceEffect effect) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryForFourDifferentCardsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryForFourDifferentCardsEffect.java index c49f7ff6225..7d3ddde1d98 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryForFourDifferentCardsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryForFourDifferentCardsEffect.java @@ -34,7 +34,7 @@ public class SearchLibraryForFourDifferentCardsEffect extends OneShotEffect { staticText = "search your library for up to four " + filter + " with different names and reveal them. " + (useTargetPointer ? "Target" : "An") + " opponent chooses two of those cards. Put the chosen cards into your graveyard and the rest " + - putCards.getMessage(false, false) + ", then shuffle"; + putCards.getMessage(false, false) + ". Then shuffle"; } private SearchLibraryForFourDifferentCardsEffect(final SearchLibraryForFourDifferentCardsEffect effect) { diff --git a/Mage/src/main/java/mage/target/TargetImpl.java b/Mage/src/main/java/mage/target/TargetImpl.java index e0a00773cc2..ffb46ca4c70 100644 --- a/Mage/src/main/java/mage/target/TargetImpl.java +++ b/Mage/src/main/java/mage/target/TargetImpl.java @@ -141,6 +141,7 @@ public abstract class TargetImpl implements Target { addTargetWord = false; } else if (targetName.endsWith("any target") || targetName.endsWith("any other target") + || targetName.endsWith("another target") || targetName.endsWith("targets")) { addTargetWord = false; }