From dd459c484fc3e2c85b62a3a824666434b2506003 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Thu, 23 Nov 2023 01:45:35 -0500 Subject: [PATCH] followup text fixes --- Mage.Sets/src/mage/cards/a/AmbushCommander.java | 2 +- Mage.Sets/src/mage/cards/k/Kudzu.java | 2 +- Mage.Sets/src/mage/cards/l/LifeDeath.java | 5 ++--- Mage.Sets/src/mage/cards/l/LivingPlane.java | 9 +++++---- Mage.Sets/src/mage/cards/n/NaturesRevolt.java | 9 +++++---- Mage.Sets/src/mage/cards/r/RudeAwakening.java | 5 ++--- .../abilities/effects/common/SacrificeAllEffect.java | 8 +++++--- 7 files changed, 21 insertions(+), 19 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AmbushCommander.java b/Mage.Sets/src/mage/cards/a/AmbushCommander.java index 0f18d08bc12..b21ba4a8461 100644 --- a/Mage.Sets/src/mage/cards/a/AmbushCommander.java +++ b/Mage.Sets/src/mage/cards/a/AmbushCommander.java @@ -40,7 +40,7 @@ public final class AmbushCommander extends CardImpl { // Forests you control are 1/1 green Elf creatures that are still lands. ContinuousEffect effect = new BecomesCreatureAllEffect( - new CreatureToken(1, 1, "1/1 green Elf creature").withColor("G").withSubType(SubType.ELF), + new CreatureToken(1, 1, "1/1 green Elf creatures").withColor("G").withSubType(SubType.ELF), "lands", filter2, Duration.WhileOnBattlefield, true); effect.getDependencyTypes().add(DependencyType.BecomeForest); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); diff --git a/Mage.Sets/src/mage/cards/k/Kudzu.java b/Mage.Sets/src/mage/cards/k/Kudzu.java index 771379b3509..2941643d9ef 100644 --- a/Mage.Sets/src/mage/cards/k/Kudzu.java +++ b/Mage.Sets/src/mage/cards/k/Kudzu.java @@ -58,7 +58,7 @@ class KudzuEffect extends OneShotEffect { public KudzuEffect() { super(Outcome.Detriment); - staticText = "destroy it. That land's controller attaches {this} to a land of their choice"; + staticText = "destroy it. That land's controller may attach {this} to a land of their choice"; } private KudzuEffect(final KudzuEffect effect) { diff --git a/Mage.Sets/src/mage/cards/l/LifeDeath.java b/Mage.Sets/src/mage/cards/l/LifeDeath.java index 768f5157f54..3d767262e20 100644 --- a/Mage.Sets/src/mage/cards/l/LifeDeath.java +++ b/Mage.Sets/src/mage/cards/l/LifeDeath.java @@ -1,4 +1,3 @@ - package mage.cards.l; import java.util.UUID; @@ -14,7 +13,6 @@ import mage.constants.Outcome; import mage.constants.SpellAbilityType; import mage.constants.Zone; import mage.filter.StaticFilters; -import mage.filter.common.FilterControlledLandPermanent; import mage.game.Game; import mage.game.permanent.token.custom.CreatureToken; import mage.players.Player; @@ -34,7 +32,8 @@ public final class LifeDeath extends SplitCard { // All lands you control become 1/1 creatures until end of turn. They're still lands. getLeftHalfCard().getSpellAbility().addEffect(new BecomesCreatureAllEffect( new CreatureToken(1, 1), - "lands", new FilterControlledLandPermanent("lands you control"), Duration.EndOfTurn, false)); + "lands", StaticFilters.FILTER_CONTROLLED_PERMANENT_LANDS, Duration.EndOfTurn, false) + .setText("all lands you control become 1/1 creatures until end of turn. They're still lands")); // Death // Return target creature card from your graveyard to the battlefield. You lose life equal to its converted mana cost. diff --git a/Mage.Sets/src/mage/cards/l/LivingPlane.java b/Mage.Sets/src/mage/cards/l/LivingPlane.java index 11cf4f6fe02..9b0a098b773 100644 --- a/Mage.Sets/src/mage/cards/l/LivingPlane.java +++ b/Mage.Sets/src/mage/cards/l/LivingPlane.java @@ -1,4 +1,3 @@ - package mage.cards.l; import java.util.UUID; @@ -10,7 +9,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SuperType; import mage.constants.Zone; -import mage.filter.StaticFilters; +import mage.filter.common.FilterLandPermanent; import mage.game.permanent.token.custom.CreatureToken; /** @@ -19,14 +18,16 @@ import mage.game.permanent.token.custom.CreatureToken; */ public final class LivingPlane extends CardImpl { + private static final FilterLandPermanent filter = new FilterLandPermanent("all lands"); + public LivingPlane(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}{G}"); this.supertype.add(SuperType.WORLD); // All lands are 1/1 creatures that are still lands. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAllEffect( - new CreatureToken(1, 1), - "lands", StaticFilters.FILTER_LANDS, Duration.WhileOnBattlefield, false))); + new CreatureToken(1, 1, "1/1 creatures"), + "lands", filter, Duration.WhileOnBattlefield, false))); } private LivingPlane(final LivingPlane card) { diff --git a/Mage.Sets/src/mage/cards/n/NaturesRevolt.java b/Mage.Sets/src/mage/cards/n/NaturesRevolt.java index 486c7d0a1c4..b1e609b262b 100644 --- a/Mage.Sets/src/mage/cards/n/NaturesRevolt.java +++ b/Mage.Sets/src/mage/cards/n/NaturesRevolt.java @@ -1,4 +1,3 @@ - package mage.cards.n; import java.util.UUID; @@ -19,13 +18,15 @@ import mage.game.permanent.token.custom.CreatureToken; */ public final class NaturesRevolt extends CardImpl { + private static final FilterLandPermanent filter = new FilterLandPermanent("all lands"); + public NaturesRevolt(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{G}{G}"); // All lands are 2/2 creatures that are still lands. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAllEffect( - new CreatureToken(2, 2), - "lands", new FilterLandPermanent(), Duration.WhileOnBattlefield, false))); + new CreatureToken(2, 2, "2/2 creatures"), + "lands", filter, Duration.WhileOnBattlefield, false))); } private NaturesRevolt(final NaturesRevolt card) { @@ -36,4 +37,4 @@ public final class NaturesRevolt extends CardImpl { public NaturesRevolt copy() { return new NaturesRevolt(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/r/RudeAwakening.java b/Mage.Sets/src/mage/cards/r/RudeAwakening.java index 4238ef149b9..2749492f1d4 100644 --- a/Mage.Sets/src/mage/cards/r/RudeAwakening.java +++ b/Mage.Sets/src/mage/cards/r/RudeAwakening.java @@ -1,4 +1,3 @@ - package mage.cards.r; import java.util.UUID; @@ -29,7 +28,7 @@ public final class RudeAwakening extends CardImpl { this.getSpellAbility().addEffect(new UntapAllLandsControllerEffect()); // or until end of turn, lands you control become 2/2 creatures that are still lands. Mode mode = new Mode(new BecomesCreatureAllEffect( - new CreatureToken(2, 2), + new CreatureToken(2, 2, "2/2 creatures"), "lands", new FilterControlledLandPermanent("lands you control"), Duration.EndOfTurn, false)); this.getSpellAbility().getModes().addMode(mode); @@ -45,4 +44,4 @@ public final class RudeAwakening extends CardImpl { public RudeAwakening copy() { return new RudeAwakening(this); } -} \ No newline at end of file +} diff --git a/Mage/src/main/java/mage/abilities/effects/common/SacrificeAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SacrificeAllEffect.java index 3291fe7e467..71c2247c6d3 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SacrificeAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SacrificeAllEffect.java @@ -1,4 +1,3 @@ - package mage.abilities.effects.common; import mage.abilities.Ability; @@ -87,11 +86,14 @@ public class SacrificeAllEffect extends OneShotEffect { if (amount.toString().equals("X")) { sb.append(amount.toString()); sb.append(' '); - } else if (!filter.getMessage().startsWith("a ")) { + sb.append(filter.getMessage()); + } else if (amount.toString().equals("1")) { + sb.append(CardUtil.addArticle(filter.getMessage())); + } else { sb.append(CardUtil.numberToText(amount.toString(), "a")); sb.append(' '); + sb.append(filter.getMessage()); } - sb.append(filter.getMessage()); staticText = sb.toString(); }