From 501e769691ac7a858789d60299f5633e86c22c70 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Tue, 8 Nov 2022 18:10:51 -0500 Subject: [PATCH] [GN3] various text fixes --- .../src/mage/cards/d/DiluvianPrimordial.java | 2 +- Mage.Sets/src/mage/cards/d/DragonTempest.java | 2 +- .../src/mage/cards/f/FlametongueKavu.java | 2 +- Mage.Sets/src/mage/cards/f/FogBank.java | 20 +++++++++---------- Mage.Sets/src/mage/cards/r/Repulse.java | 2 +- .../src/mage/cards/t/ThornLieutenant.java | 2 +- .../java/mage/verify/VerifyCardDataTest.java | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Mage.Sets/src/mage/cards/d/DiluvianPrimordial.java b/Mage.Sets/src/mage/cards/d/DiluvianPrimordial.java index d2265677e14..a09fa0e7126 100644 --- a/Mage.Sets/src/mage/cards/d/DiluvianPrimordial.java +++ b/Mage.Sets/src/mage/cards/d/DiluvianPrimordial.java @@ -88,7 +88,7 @@ class DiluvianPrimordialEffect extends OneShotEffect { this.staticText = "for each opponent, you may cast up to one target " + "instant or sorcery card from that player's graveyard without " + "paying its mana cost. If a spell cast this way would be put " - + "into a graveyard this turn, exile it instead"; + + "into a graveyard, exile it instead"; } public DiluvianPrimordialEffect(final DiluvianPrimordialEffect effect) { diff --git a/Mage.Sets/src/mage/cards/d/DragonTempest.java b/Mage.Sets/src/mage/cards/d/DragonTempest.java index 1d799a80cdd..137b1cefb2f 100644 --- a/Mage.Sets/src/mage/cards/d/DragonTempest.java +++ b/Mage.Sets/src/mage/cards/d/DragonTempest.java @@ -36,7 +36,7 @@ public final class DragonTempest extends CardImpl { // Whenever a creature with flying enters the battlefield under your control, it gains haste until the end of turn. Effect effect = new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn); - effect.setText("it gains haste until the end of turn"); + effect.setText("it gains haste until end of turn"); this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, effect, filterFlying, false, SetTargetPointer.PERMANENT, "")); // Whenever a Dragon enters the battlefield under your control, it deals X damage to any target, where X is the number of Dragons you control. diff --git a/Mage.Sets/src/mage/cards/f/FlametongueKavu.java b/Mage.Sets/src/mage/cards/f/FlametongueKavu.java index 4500163a115..ffdb4a29e69 100644 --- a/Mage.Sets/src/mage/cards/f/FlametongueKavu.java +++ b/Mage.Sets/src/mage/cards/f/FlametongueKavu.java @@ -24,7 +24,7 @@ public final class FlametongueKavu extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(2); - Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(4), false); + Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(4, "it"), false); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/FogBank.java b/Mage.Sets/src/mage/cards/f/FogBank.java index cb04fdf06e6..5133e469157 100644 --- a/Mage.Sets/src/mage/cards/f/FogBank.java +++ b/Mage.Sets/src/mage/cards/f/FogBank.java @@ -1,7 +1,5 @@ - package mage.cards.f; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -12,18 +10,18 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Duration; -import mage.constants.Zone; +import mage.constants.SubType; + +import java.util.UUID; /** - * * @author jeffwadsworth */ public final class FogBank extends CardImpl { public FogBank(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.subtype.add(SubType.WALL); this.power = new MageInt(0); @@ -31,13 +29,15 @@ public final class FogBank extends CardImpl { // Defender this.addAbility(DefenderAbility.getInstance()); - + // Flying this.addAbility(FlyingAbility.getInstance()); - + // Prevent all combat damage that would be dealt to and dealt by Fog Bank. - Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventCombatDamageToSourceEffect(Duration.WhileOnBattlefield)); - ability.addEffect(new PreventCombatDamageBySourceEffect(Duration.WhileOnBattlefield)); + Ability ability = new SimpleStaticAbility(new PreventCombatDamageToSourceEffect(Duration.WhileOnBattlefield) + .setText("prevent all combat damage that would be dealt to")); + ability.addEffect(new PreventCombatDamageBySourceEffect(Duration.WhileOnBattlefield) + .setText("and dealt by {this}")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/r/Repulse.java b/Mage.Sets/src/mage/cards/r/Repulse.java index 2ceedcee009..9090078f13b 100644 --- a/Mage.Sets/src/mage/cards/r/Repulse.java +++ b/Mage.Sets/src/mage/cards/r/Repulse.java @@ -23,7 +23,7 @@ public final class Repulse extends CardImpl { this.getSpellAbility().addEffect(new ReturnToHandTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Draw a card. - this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1).concatBy("
")); } private Repulse(final Repulse card) { diff --git a/Mage.Sets/src/mage/cards/t/ThornLieutenant.java b/Mage.Sets/src/mage/cards/t/ThornLieutenant.java index df2f20406f3..5b0ceebdd9e 100644 --- a/Mage.Sets/src/mage/cards/t/ThornLieutenant.java +++ b/Mage.Sets/src/mage/cards/t/ThornLieutenant.java @@ -33,7 +33,7 @@ public final class ThornLieutenant extends CardImpl { this.addAbility(new BecomesTargetTriggeredAbility( new CreateTokenEffect(new ElfWarriorToken()), StaticFilters.FILTER_SPELL_OR_ABILITY_OPPONENTS - )); + ).setTriggerPhrase("Whenever {this} becomes the target of a spell or ability an opponent controls, ")); // {5}{G}: Thorn Lieutenant gets +4/+4 until end of turn. this.addAbility(new SimpleActivatedAbility( diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java index daa206fa686..d954a2eedc0 100644 --- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java +++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java @@ -60,7 +60,7 @@ public class VerifyCardDataTest { private static final Logger logger = Logger.getLogger(VerifyCardDataTest.class); - private static final String FULL_ABILITIES_CHECK_SET_CODE = "NCC"; // check all abilities and output cards with wrong abilities texts; + private static final String FULL_ABILITIES_CHECK_SET_CODE = "GN3"; // check all abilities and output cards with wrong abilities texts; private static final boolean AUTO_FIX_SAMPLE_DECKS = false; // debug only: auto-fix sample decks by test_checkSampleDecks test run private static final boolean ONLY_TEXT = false; // use when checking text locally, suppresses unnecessary checks and output messages