From a9cd45c84efd20ba219f16c4f63f952412558f80 Mon Sep 17 00:00:00 2001 From: theelk801 Date: Sat, 31 May 2025 10:09:59 -0400 Subject: [PATCH] [FIN] more text fixes --- Mage.Sets/src/mage/cards/b/BraskasFinalAeon.java | 2 +- Mage.Sets/src/mage/cards/p/PhantomTrain.java | 3 ++- Mage.Sets/src/mage/cards/s/SummonAlexander.java | 2 +- Mage.Sets/src/mage/cards/s/SummonEsperMaduin.java | 2 +- Mage.Sets/src/mage/cards/s/SummonGFCerberus.java | 2 +- Mage.Sets/src/mage/cards/t/TerraMagicalAdept.java | 2 +- .../src/test/java/mage/verify/VerifyCardDataTest.java | 2 +- Mage/src/main/java/mage/abilities/common/SagaAbility.java | 7 ++++++- .../AddCounterNextSpellDelayedTriggeredAbility.java | 2 +- .../src/main/java/mage/abilities/keyword/EquipAbility.java | 2 +- 10 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Mage.Sets/src/mage/cards/b/BraskasFinalAeon.java b/Mage.Sets/src/mage/cards/b/BraskasFinalAeon.java index 13c1c757d9a..a59cb3fc942 100644 --- a/Mage.Sets/src/mage/cards/b/BraskasFinalAeon.java +++ b/Mage.Sets/src/mage/cards/b/BraskasFinalAeon.java @@ -44,7 +44,7 @@ public final class BraskasFinalAeon extends CardImpl { ability.addEffect(new SacrificeOpponentsEffect(2, StaticFilters.FILTER_PERMANENT_CREATURES)); ability.withFlavorWord("Ultimate Jecht Shot"); }); - this.addAbility(sagaAbility); + this.addAbility(sagaAbility.withShowSacText(true)); // Menace this.addAbility(new MenaceAbility()); diff --git a/Mage.Sets/src/mage/cards/p/PhantomTrain.java b/Mage.Sets/src/mage/cards/p/PhantomTrain.java index 2e7f7480b82..64d7541a0ce 100644 --- a/Mage.Sets/src/mage/cards/p/PhantomTrain.java +++ b/Mage.Sets/src/mage/cards/p/PhantomTrain.java @@ -37,13 +37,14 @@ public final class PhantomTrain extends CardImpl { Ability ability = new SimpleActivatedAbility( new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE_OR_ARTIFACT) + .setText("sacrifice another artifact or creature") ); ability.addEffect(new AddCardTypeSourceEffect( Duration.EndOfTurn, CardType.ARTIFACT, CardType.CREATURE ).setText("it becomes a")); ability.addEffect(new AddCardSubTypeSourceEffect( Duration.EndOfTurn, true, SubType.SPIRIT - ).setText("Spirit artifact creature in addition to its other types until end of turn")); + ).setText(" Spirit artifact creature in addition to its other types until end of turn")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SummonAlexander.java b/Mage.Sets/src/mage/cards/s/SummonAlexander.java index 271089ba2fa..6a752a4b835 100644 --- a/Mage.Sets/src/mage/cards/s/SummonAlexander.java +++ b/Mage.Sets/src/mage/cards/s/SummonAlexander.java @@ -46,7 +46,7 @@ public final class SummonAlexander extends CardImpl { this, SagaChapter.CHAPTER_III, new TapAllEffect(StaticFilters.FILTER_OPPONENTS_PERMANENT_CREATURES) ); - this.addAbility(sagaAbility); + this.addAbility(sagaAbility.withShowSacText(true)); // Flying this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/cards/s/SummonEsperMaduin.java b/Mage.Sets/src/mage/cards/s/SummonEsperMaduin.java index 174228f4533..a8015ec0963 100644 --- a/Mage.Sets/src/mage/cards/s/SummonEsperMaduin.java +++ b/Mage.Sets/src/mage/cards/s/SummonEsperMaduin.java @@ -55,7 +55,7 @@ public final class SummonEsperMaduin extends CardImpl { StaticFilters.FILTER_PERMANENT_CREATURE, true ).setText("and gain trample until end of turn") ); - this.addAbility(sagaAbility); + this.addAbility(sagaAbility.withShowSacText(true)); } private SummonEsperMaduin(final SummonEsperMaduin card) { diff --git a/Mage.Sets/src/mage/cards/s/SummonGFCerberus.java b/Mage.Sets/src/mage/cards/s/SummonGFCerberus.java index 4258df81a63..65592498f6d 100644 --- a/Mage.Sets/src/mage/cards/s/SummonGFCerberus.java +++ b/Mage.Sets/src/mage/cards/s/SummonGFCerberus.java @@ -32,7 +32,7 @@ public final class SummonGFCerberus extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); - // (As this Saga enters and after your draw step, add a lore counter. Sacrifice after IV.) + // (As this Saga enters and after your draw step, add a lore counter. Sacrifice after III.) SagaAbility sagaAbility = new SagaAbility(this); // I -- Surveil 1. diff --git a/Mage.Sets/src/mage/cards/t/TerraMagicalAdept.java b/Mage.Sets/src/mage/cards/t/TerraMagicalAdept.java index 34864b9ec3e..4913d04db81 100644 --- a/Mage.Sets/src/mage/cards/t/TerraMagicalAdept.java +++ b/Mage.Sets/src/mage/cards/t/TerraMagicalAdept.java @@ -38,7 +38,7 @@ public final class TerraMagicalAdept extends CardImpl { // When Terra enters, mill five cards. Put up to one enchantment milled this this way into your hand. this.addAbility(new EntersBattlefieldTriggeredAbility(new MillThenPutInHandEffect( 5, StaticFilters.FILTER_CARD_ENCHANTMENT, true - ))); + ).setText("mill five cards. Put up to one enchantment milled this this way into your hand"))); // Trance -- {4}{R}{G}, {T}: Exile Terra, then return it to the battlefield transformed under its owner's control. Activate only as a sorcery. this.addAbility(new TransformAbility()); diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java index 1dd2eb42a95..864939b06d5 100644 --- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java +++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java @@ -71,7 +71,7 @@ public class VerifyCardDataTest { private static final Logger logger = Logger.getLogger(VerifyCardDataTest.class); - private static final String FULL_ABILITIES_CHECK_SET_CODES = "FIC"; // check ability text due mtgjson, can use multiple sets like MAT;CMD or * for all + private static final String FULL_ABILITIES_CHECK_SET_CODES = "FIN"; // check ability text due mtgjson, can use multiple sets like MAT;CMD or * for all private static final boolean CHECK_ONLY_ABILITIES_TEXT = false; // use when checking text locally, suppresses unnecessary checks and output messages private static final boolean CHECK_COPYABLE_FIELDS = true; // disable for better verify test performance diff --git a/Mage/src/main/java/mage/abilities/common/SagaAbility.java b/Mage/src/main/java/mage/abilities/common/SagaAbility.java index 803556ae727..957f0f3d9b0 100644 --- a/Mage/src/main/java/mage/abilities/common/SagaAbility.java +++ b/Mage/src/main/java/mage/abilities/common/SagaAbility.java @@ -31,7 +31,7 @@ import java.util.function.Consumer; public class SagaAbility extends SimpleStaticAbility { private final SagaChapter maxChapter; - private final boolean showSacText; + private boolean showSacText; private final boolean readAhead; public SagaAbility(Card card) { @@ -134,6 +134,11 @@ public class SagaAbility extends SimpleStaticAbility { return maxChapter; } + public SagaAbility withShowSacText(boolean showSacText) { + this.showSacText = showSacText; + return this; + } + @Override public String getRule() { return (readAhead diff --git a/Mage/src/main/java/mage/abilities/common/delayed/AddCounterNextSpellDelayedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/delayed/AddCounterNextSpellDelayedTriggeredAbility.java index c9f27e13629..f06e2b3eb62 100644 --- a/Mage/src/main/java/mage/abilities/common/delayed/AddCounterNextSpellDelayedTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/delayed/AddCounterNextSpellDelayedTriggeredAbility.java @@ -72,7 +72,7 @@ class AddCounterNextSpellEffect extends ReplacementEffectImpl { AddCounterNextSpellEffect(int amount) { super(Duration.EndOfStep, Outcome.BoostCreature); this.amount = amount; - staticText = "that creature enters the battlefield with " + CardUtil.numberToText(amount, "an") + " additional +1/+1 counter" + (amount > 1 ? "s" : "") + " on it"; + staticText = "that creature enters with " + CardUtil.numberToText(amount, "an") + " additional +1/+1 counter" + (amount > 1 ? "s" : "") + " on it"; } private AddCounterNextSpellEffect(AddCounterNextSpellEffect effect) { diff --git a/Mage/src/main/java/mage/abilities/keyword/EquipAbility.java b/Mage/src/main/java/mage/abilities/keyword/EquipAbility.java index a9457f751ed..9c55d877d04 100644 --- a/Mage/src/main/java/mage/abilities/keyword/EquipAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/EquipAbility.java @@ -109,6 +109,6 @@ public class EquipAbility extends ActivatedAbilityImpl { if (showAbilityHint) { sb.append(reminderText); } - return sb.toString(); + return sb.toString().replace("..", "."); } }