From fba68a72554ab9eab9cc87a3c8d7f33262ca572e Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Wed, 24 Nov 2021 20:56:31 -0500 Subject: [PATCH] removed instances of incorrect quote characters, expanded test --- Mage.Sets/src/mage/cards/l/LifeMatrix.java | 8 ++++---- Mage.Sets/src/mage/cards/m/MasterOfTheHunt.java | 16 +++++++++------- Mage.Sets/src/mage/cards/s/SplinteringWind.java | 14 ++++++++------ .../java/mage/verify/VerifyCardDataTest.java | 14 ++++++++++---- .../permanent/token/WolvesOfTheHuntToken.java | 8 +++----- 5 files changed, 34 insertions(+), 26 deletions(-) diff --git a/Mage.Sets/src/mage/cards/l/LifeMatrix.java b/Mage.Sets/src/mage/cards/l/LifeMatrix.java index 842430660a..f1f6d57d3f 100644 --- a/Mage.Sets/src/mage/cards/l/LifeMatrix.java +++ b/Mage.Sets/src/mage/cards/l/LifeMatrix.java @@ -1,6 +1,5 @@ package mage.cards.l; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.IsStepCondition; @@ -20,8 +19,9 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** - * * @author L_J */ public final class LifeMatrix extends CardImpl { @@ -37,8 +37,8 @@ public final class LifeMatrix extends CardImpl { new AddCountersTargetEffect(CounterType.MATRIX.createInstance()), new GenericManaCost(4), new IsStepCondition(PhaseStep.UPKEEP), "Put a matrix counter on target creature and " - + "that creature gains “Remove a matrix counter from this creature: " - + "Regenerate this creature.” Activate only during your upkeep."); + + "that creature gains \"Remove a matrix counter from this creature: " + + "Regenerate this creature.\" Activate only during your upkeep."); Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new RemoveCountersSourceCost(CounterType.MATRIX.createInstance())); diff --git a/Mage.Sets/src/mage/cards/m/MasterOfTheHunt.java b/Mage.Sets/src/mage/cards/m/MasterOfTheHunt.java index 39b54182e4..106776f83e 100644 --- a/Mage.Sets/src/mage/cards/m/MasterOfTheHunt.java +++ b/Mage.Sets/src/mage/cards/m/MasterOfTheHunt.java @@ -1,6 +1,5 @@ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -9,14 +8,15 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.Zone; import mage.game.permanent.token.WolvesOfTheHuntToken; +import java.util.UUID; + /** * @author L_J */ public final class MasterOfTheHunt extends CardImpl { - + public MasterOfTheHunt(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{G}"); this.subtype.add(SubType.HUMAN); @@ -24,16 +24,18 @@ public final class MasterOfTheHunt extends CardImpl { this.toughness = new MageInt(2); // Create a 1/1 green Wolf creature token named Wolves of the Hunt. It has “bands with other creatures named Wolves of the Hunt.” - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WolvesOfTheHuntToken()).setText("Create a 1/1 green Wolf creature token named Wolves of the Hunt. It has “bands with other creatures named Wolves of the Hunt.”"), new ManaCostsImpl("{2}{G}{G}"))); + this.addAbility(new SimpleActivatedAbility( + new CreateTokenEffect(new WolvesOfTheHuntToken()), new ManaCostsImpl<>("{2}{G}{G}") + )); } - + private MasterOfTheHunt(final MasterOfTheHunt card) { super(card); } - + @Override public MasterOfTheHunt copy() { return new MasterOfTheHunt(this); } - + } diff --git a/Mage.Sets/src/mage/cards/s/SplinteringWind.java b/Mage.Sets/src/mage/cards/s/SplinteringWind.java index 13e98844e9..c51db80358 100644 --- a/Mage.Sets/src/mage/cards/s/SplinteringWind.java +++ b/Mage.Sets/src/mage/cards/s/SplinteringWind.java @@ -1,7 +1,5 @@ - package mage.cards.s; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -13,7 +11,10 @@ import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.game.events.GameEvent; @@ -23,8 +24,9 @@ import mage.game.permanent.token.SplinterToken; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** - * * @author L_J */ public final class SplinteringWind extends CardImpl { @@ -53,7 +55,7 @@ class SplinteringWindCreateTokenEffect extends OneShotEffect { public SplinteringWindCreateTokenEffect() { super(Outcome.PutCreatureInPlay); - staticText = "create a 1/1 green Splinter creature token. It has flying and “Cumulative upkeep {G}.” When it leaves the battlefield, it deals 1 damage to you and each creature you control"; + staticText = "create a 1/1 green Splinter creature token. It has flying and \"Cumulative upkeep {G}.\" When it leaves the battlefield, it deals 1 damage to you and each creature you control"; } public SplinteringWindCreateTokenEffect(final SplinteringWindCreateTokenEffect effect) { @@ -83,7 +85,7 @@ class SplinteringWindCreateTokenEffect extends OneShotEffect { } class SplinteringWindDelayedTriggeredAbility extends DelayedTriggeredAbility { - + private UUID tokenId; SplinteringWindDelayedTriggeredAbility(UUID tokenId) { diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java index 84988f7daf..03e7a210b6 100644 --- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java +++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java @@ -1425,14 +1425,20 @@ public class VerifyCardDataTest { } } + private static final String[] wrongSymbols = {"’", "“", "”"}; + private void checkWrongSymbolsInRules(Card card) { - if (card.getName().contains("’")) { - fail(card, "card name", "card's names contains restricted symbol ’"); + for (String s : wrongSymbols) { + if (card.getName().contains(s)) { + fail(card, "card name", "card's name contains restricted symbol " + s); + } } for (String rule : card.getRules()) { - if (rule.contains("’")) { - fail(card, "rules", "card's rules contains restricted symbol ’"); + for (String s : wrongSymbols) { + if (rule.contains(s)) { + fail(card, "rules", "card's rules contains restricted symbol " + s); + } } if (rule.contains("&mdash ")) { fail(card, "rules", "card's rules contains restricted test [&mdash ] instead [—]"); diff --git a/Mage/src/main/java/mage/game/permanent/token/WolvesOfTheHuntToken.java b/Mage/src/main/java/mage/game/permanent/token/WolvesOfTheHuntToken.java index af156cd597..2228a47665 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WolvesOfTheHuntToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WolvesOfTheHuntToken.java @@ -1,19 +1,17 @@ - package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.BandsWithOtherAbility; +import mage.constants.CardType; +import mage.constants.SubType; /** - * * @author L_J */ public final class WolvesOfTheHuntToken extends TokenImpl { public WolvesOfTheHuntToken() { - super("Wolves of the Hunt", "1/1 green Wolf creature token named Wolves of the Hunt"); + super("Wolves of the Hunt", "1/1 green Wolf creature token named Wolves of the Hunt. It has \"bands with other creatures named Wolves of the Hunt.\""); cardType.add(CardType.CREATURE); subtype.add(SubType.WOLF); color.setGreen(true);