From 410144eb52a9c333957cbe1b0b7eb9547dfca0d4 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 1 Jun 2024 15:52:59 -0400 Subject: [PATCH] some text fixes --- Mage.Sets/src/mage/cards/a/AgencyOutfitter.java | 3 ++- Mage.Sets/src/mage/cards/c/CorrosiveOoze.java | 3 ++- Mage.Sets/src/mage/cards/d/DiscreetRetreat.java | 4 ++-- Mage.Sets/src/mage/cards/f/FickleEfreet.java | 4 +++- Mage.Sets/src/mage/cards/i/IncineratorOfTheGuilty.java | 4 ++-- Mage.Sets/src/mage/cards/k/KraulHarpooner.java | 6 +++--- Mage.Sets/src/mage/cards/m/MemoryVessel.java | 2 +- Mage.Sets/src/mage/cards/r/RunawayCarriage.java | 3 ++- Mage.Sets/src/mage/cards/s/SalvationColossus.java | 2 +- Mage.Sets/src/mage/cards/t/TimeElemental.java | 3 ++- 10 files changed, 20 insertions(+), 14 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AgencyOutfitter.java b/Mage.Sets/src/mage/cards/a/AgencyOutfitter.java index e6d1980d5b2..dfaf1ddcdde 100644 --- a/Mage.Sets/src/mage/cards/a/AgencyOutfitter.java +++ b/Mage.Sets/src/mage/cards/a/AgencyOutfitter.java @@ -56,7 +56,8 @@ class AgencyOutfitterEffect extends OneShotEffect { AgencyOutfitterEffect() { super(Outcome.UnboostCreature); - this.staticText = "you may search your graveyard, hand, and/or library for a card named Magnifying Glass and/or a card named Thinking Cap and put them onto the battlefield. If you search your library this way, shuffle."; + this.staticText = "you may search your graveyard, hand and/or library for a card named Magnifying Glass" + + " and/or a card named Thinking Cap and put them onto the battlefield. If you search your library this way, shuffle."; } private AgencyOutfitterEffect(final AgencyOutfitterEffect effect) { diff --git a/Mage.Sets/src/mage/cards/c/CorrosiveOoze.java b/Mage.Sets/src/mage/cards/c/CorrosiveOoze.java index 60525a5cf08..9f4eaa907ee 100644 --- a/Mage.Sets/src/mage/cards/c/CorrosiveOoze.java +++ b/Mage.Sets/src/mage/cards/c/CorrosiveOoze.java @@ -43,7 +43,8 @@ public final class CorrosiveOoze extends CardImpl { this.toughness = new MageInt(2); // Whenever Corrosive Ooze blocks or becomes blocked by an equipped creature, destroy all Equipment attached to that creature at end of combat. - Effect effect = new CreateDelayedTriggeredAbilityEffect(new AtTheEndOfCombatDelayedTriggeredAbility(new CorrosiveOozeEffect()), true); + Effect effect = new CreateDelayedTriggeredAbilityEffect(new AtTheEndOfCombatDelayedTriggeredAbility(new CorrosiveOozeEffect()) + .setTriggerPhrase(""), true); this.addAbility(new BlocksOrBlockedByCreatureSourceTriggeredAbility(effect, filter), new CorrosiveOozeCombatWatcher()); } diff --git a/Mage.Sets/src/mage/cards/d/DiscreetRetreat.java b/Mage.Sets/src/mage/cards/d/DiscreetRetreat.java index 27bdea4026d..a8cd429041b 100644 --- a/Mage.Sets/src/mage/cards/d/DiscreetRetreat.java +++ b/Mage.Sets/src/mage/cards/d/DiscreetRetreat.java @@ -49,13 +49,13 @@ public final class DiscreetRetreat extends CardImpl { Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); - // Enchanted land has "{T}: Add two mana of any one color. Spend this mana only to cast outlaw spells or activate abilities from outlaw sources." + // Enchanted land has "{T}: Add two mana of any one color. Spend this mana only to cast outlaw spells or activate abilities of outlaw sources." Ability gainedAbility = new ConditionalAnyColorManaAbility( new TapSourceCost(), 2, new DiscreetRetreatManaBuilder() ); Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA); effect.setText("Enchanted land has \"{T}: Add two mana of any one color. " - + "Spend this mana only to cast outlaw spells or activate abilities from outlaw sources.\""); + + "Spend this mana only to cast outlaw spells or activate abilities of outlaw sources.\""); this.addAbility(new SimpleStaticAbility(effect)); // Whenever you cast your first outlaw spell each turn, you draw a card and you lose 1 life. diff --git a/Mage.Sets/src/mage/cards/f/FickleEfreet.java b/Mage.Sets/src/mage/cards/f/FickleEfreet.java index 0d0326ceb10..7bf6dcbf045 100644 --- a/Mage.Sets/src/mage/cards/f/FickleEfreet.java +++ b/Mage.Sets/src/mage/cards/f/FickleEfreet.java @@ -34,7 +34,9 @@ public final class FickleEfreet extends CardImpl { // Whenever Fickle Efreet attacks or blocks, flip a coin at end of combat. If you lose the flip, an opponent gains control of Fickle Efreet. this.addAbility(new AttacksOrBlocksTriggeredAbility(new CreateDelayedTriggeredAbilityEffect( - new AtTheEndOfCombatDelayedTriggeredAbility(new FickleEfreetChangeControlEffect()), true), false)); + new AtTheEndOfCombatDelayedTriggeredAbility(new FickleEfreetChangeControlEffect()) + .setTriggerPhrase(""), true), false) + .setTriggerPhrase("Whenever {this} attacks or blocks, ")); } private FickleEfreet(final FickleEfreet card) { diff --git a/Mage.Sets/src/mage/cards/i/IncineratorOfTheGuilty.java b/Mage.Sets/src/mage/cards/i/IncineratorOfTheGuilty.java index 862dec97d85..da0c6f4a502 100644 --- a/Mage.Sets/src/mage/cards/i/IncineratorOfTheGuilty.java +++ b/Mage.Sets/src/mage/cards/i/IncineratorOfTheGuilty.java @@ -57,7 +57,7 @@ public final class IncineratorOfTheGuilty extends CardImpl { class IncineratorOfTheGuiltyEffect extends OneShotEffect { - private static final FilterPermanent filter = new FilterPermanent("creature and each planeswalker"); + private static final FilterPermanent filter = new FilterPermanent("creature and planeswalker"); static { filter.add( @@ -69,7 +69,7 @@ class IncineratorOfTheGuiltyEffect extends OneShotEffect { IncineratorOfTheGuiltyEffect() { super(Outcome.Benefit); staticText = "you may collect evidence X. When you do, {this} deals X damage " + - "to each creature and each planeswalker that player controls."; + "to each creature and planeswalker that player controls."; } private IncineratorOfTheGuiltyEffect(final IncineratorOfTheGuiltyEffect effect) { diff --git a/Mage.Sets/src/mage/cards/k/KraulHarpooner.java b/Mage.Sets/src/mage/cards/k/KraulHarpooner.java index 0c59994bb04..8d4c080a25f 100644 --- a/Mage.Sets/src/mage/cards/k/KraulHarpooner.java +++ b/Mage.Sets/src/mage/cards/k/KraulHarpooner.java @@ -26,7 +26,7 @@ import mage.target.TargetPermanent; */ public final class KraulHarpooner extends CardImpl { - private static final FilterPermanent filter = new FilterCreaturePermanent("creature with flying you don't control"); + private static final FilterPermanent filter = new FilterCreaturePermanent("creature you don’t control with flying"); static { filter.add(TargetController.NOT_YOU.getControllerPredicate()); @@ -67,8 +67,8 @@ class KraulHarpoonerEffect extends OneShotEffect { KraulHarpoonerEffect() { super(Outcome.Benefit); - this.staticText = "choose up to one target creature with flying " - + "you don't control. {this} gets +X/+0 until end of turn, " + this.staticText = "choose up to one target creature you don't control with flying." + + " {this} gets +X/+0 until end of turn, " + "where X is the number of creature cards in your graveyard, " + "then you may have {this} fight that creature."; } diff --git a/Mage.Sets/src/mage/cards/m/MemoryVessel.java b/Mage.Sets/src/mage/cards/m/MemoryVessel.java index 326dcb0522e..eb4fc5fc7dd 100644 --- a/Mage.Sets/src/mage/cards/m/MemoryVessel.java +++ b/Mage.Sets/src/mage/cards/m/MemoryVessel.java @@ -51,7 +51,7 @@ class MemoryVesselExileEffect extends OneShotEffect { MemoryVesselExileEffect() { super(Outcome.Benefit); staticText = "each player exiles the top seven cards of their library. " + - "Until your next turn, players may play cards they exiled from their library this way"; + "Until your next turn, players may play cards they exiled this way"; } private MemoryVesselExileEffect(final MemoryVesselExileEffect effect) { diff --git a/Mage.Sets/src/mage/cards/r/RunawayCarriage.java b/Mage.Sets/src/mage/cards/r/RunawayCarriage.java index 6e5f6bc31b4..85aa4a18a29 100644 --- a/Mage.Sets/src/mage/cards/r/RunawayCarriage.java +++ b/Mage.Sets/src/mage/cards/r/RunawayCarriage.java @@ -30,7 +30,8 @@ public final class RunawayCarriage extends CardImpl { // When Runaway Carriage attacks or blocks, sacrifice it at end of combat. this.addAbility(new AttacksOrBlocksTriggeredAbility(new CreateDelayedTriggeredAbilityEffect( - new AtTheEndOfCombatDelayedTriggeredAbility(new SacrificeSourceEffect())), false)); + new AtTheEndOfCombatDelayedTriggeredAbility(new SacrificeSourceEffect() + .setText("sacrifice it at end of combat")).setTriggerPhrase("")), false)); } private RunawayCarriage(final RunawayCarriage card) { diff --git a/Mage.Sets/src/mage/cards/s/SalvationColossus.java b/Mage.Sets/src/mage/cards/s/SalvationColossus.java index 10220696e54..d26b8144a7f 100644 --- a/Mage.Sets/src/mage/cards/s/SalvationColossus.java +++ b/Mage.Sets/src/mage/cards/s/SalvationColossus.java @@ -40,7 +40,7 @@ public final class SalvationColossus extends CardImpl { // Whenever you attack, other creatures you control get +2/+2 and gain indestructible until end of turn. Ability ability = new AttacksWithCreaturesTriggeredAbility(new BoostControlledEffect( 2, 2, Duration.EndOfTurn, true - ).setText("other creatures you control get +1/+1"), 1); + ).setText("other creatures you control get +2/+2"), 1); ability.addEffect(new GainAbilityControlledEffect( IndestructibleAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURE diff --git a/Mage.Sets/src/mage/cards/t/TimeElemental.java b/Mage.Sets/src/mage/cards/t/TimeElemental.java index ef8b29d9dfd..46438c3ad6d 100644 --- a/Mage.Sets/src/mage/cards/t/TimeElemental.java +++ b/Mage.Sets/src/mage/cards/t/TimeElemental.java @@ -43,7 +43,8 @@ public final class TimeElemental extends CardImpl { this.toughness = new MageInt(2); // When Time Elemental attacks or blocks, at end of combat, sacrifice it and it deals 5 damage to you. - DelayedTriggeredAbility ability = new AtTheEndOfCombatDelayedTriggeredAbility(new SacrificeSourceEffect().setText("at end of combat, sacrifice it")); + DelayedTriggeredAbility ability = new AtTheEndOfCombatDelayedTriggeredAbility(new SacrificeSourceEffect() + .setText("at end of combat, sacrifice it")).setTriggerPhrase(""); ability.addEffect(new DamageControllerEffect(5).setText("and it deals 5 damage to you")); this.addAbility(new AttacksOrBlocksTriggeredAbility(new CreateDelayedTriggeredAbilityEffect(ability, true), false));