From 524b9fcd44d0e464ddeb834ccf80fc7d7792e986 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Tue, 6 Oct 2020 21:12:07 -0400 Subject: [PATCH] [M21] various text fixes --- Mage.Sets/src/mage/cards/b/BarrinTolarianArchmage.java | 2 +- Mage.Sets/src/mage/cards/f/FelineSovereign.java | 2 +- Mage.Sets/src/mage/cards/f/FurorOfTheBitten.java | 2 +- Mage.Sets/src/mage/cards/g/GloriousAnthem.java | 2 +- Mage.Sets/src/mage/cards/h/HeartfireImmolator.java | 4 +++- Mage.Sets/src/mage/cards/h/HistorianOfZhalfir.java | 4 ++-- Mage.Sets/src/mage/cards/l/LeafkinAvenger.java | 2 +- Mage.Sets/src/mage/cards/r/RadhaHeartOfKeld.java | 4 ++-- Mage.Sets/src/mage/cards/s/Snarespinner.java | 2 +- Mage.Sets/src/mage/cards/s/SpeakerOfTheHeavens.java | 2 +- Mage.Sets/src/mage/cards/t/ThievesGuildEnforcer.java | 2 +- Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java | 2 +- .../effects/common/continuous/BoostOpponentsEffect.java | 3 ++- .../common/search/SearchLibraryGraveyardPutInHandEffect.java | 2 +- 14 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Mage.Sets/src/mage/cards/b/BarrinTolarianArchmage.java b/Mage.Sets/src/mage/cards/b/BarrinTolarianArchmage.java index 840a3a3efc..7bdf6f46fd 100644 --- a/Mage.Sets/src/mage/cards/b/BarrinTolarianArchmage.java +++ b/Mage.Sets/src/mage/cards/b/BarrinTolarianArchmage.java @@ -29,7 +29,7 @@ import java.util.UUID; public final class BarrinTolarianArchmage extends CardImpl { private static final FilterCreatureOrPlaneswalkerPermanent filter - = new FilterCreatureOrPlaneswalkerPermanent(" other target creature or planeswalker"); + = new FilterCreatureOrPlaneswalkerPermanent("other target creature or planeswalker"); static { filter.add(AnotherPredicate.instance); diff --git a/Mage.Sets/src/mage/cards/f/FelineSovereign.java b/Mage.Sets/src/mage/cards/f/FelineSovereign.java index 7b84e45e8b..09b0b87730 100644 --- a/Mage.Sets/src/mage/cards/f/FelineSovereign.java +++ b/Mage.Sets/src/mage/cards/f/FelineSovereign.java @@ -126,6 +126,6 @@ class FelineSovereignTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever one or more Cats you control deal combat damage to a player, destroy up to one target artifact or enchantment that player controls"; + return "Whenever one or more Cats you control deal combat damage to a player, destroy up to one target artifact or enchantment that player controls."; } } diff --git a/Mage.Sets/src/mage/cards/f/FurorOfTheBitten.java b/Mage.Sets/src/mage/cards/f/FurorOfTheBitten.java index ec36907d2f..bfff3f16ff 100644 --- a/Mage.Sets/src/mage/cards/f/FurorOfTheBitten.java +++ b/Mage.Sets/src/mage/cards/f/FurorOfTheBitten.java @@ -34,7 +34,7 @@ public final class FurorOfTheBitten extends CardImpl { // Enchanted creature gets +2/+2 and attacks each turn if able. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); Effect effect = new AttacksIfAbleAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.AURA); - effect.setText("and attacks each turn if able"); + effect.setText("and attacks each combat if able"); ability.addEffect(effect); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GloriousAnthem.java b/Mage.Sets/src/mage/cards/g/GloriousAnthem.java index 0ba26a82b9..105e966f0a 100644 --- a/Mage.Sets/src/mage/cards/g/GloriousAnthem.java +++ b/Mage.Sets/src/mage/cards/g/GloriousAnthem.java @@ -21,7 +21,7 @@ public final class GloriousAnthem extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}{W}"); // Creatures you control get +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE, false))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES, false))); } public GloriousAnthem(final GloriousAnthem card) { diff --git a/Mage.Sets/src/mage/cards/h/HeartfireImmolator.java b/Mage.Sets/src/mage/cards/h/HeartfireImmolator.java index 89ca31facb..3d8399f894 100644 --- a/Mage.Sets/src/mage/cards/h/HeartfireImmolator.java +++ b/Mage.Sets/src/mage/cards/h/HeartfireImmolator.java @@ -37,7 +37,9 @@ public final class HeartfireImmolator extends CardImpl { // {R}, Sacrifice Heartfire Immolator: It deals damage equal to its power to target creature or planeswalker. Ability ability = new SimpleActivatedAbility( - new DamageTargetEffect(xValue, "it"), new ManaCostsImpl("{R}") + new DamageTargetEffect(xValue) + .setText("it deals damage equal to its power to target creature or planeswalker"), + new ManaCostsImpl("{R}") ); ability.addCost(new SacrificeSourceCost()); ability.addTarget(new TargetCreatureOrPlaneswalker()); diff --git a/Mage.Sets/src/mage/cards/h/HistorianOfZhalfir.java b/Mage.Sets/src/mage/cards/h/HistorianOfZhalfir.java index 4bbe30d4f3..1891f27128 100644 --- a/Mage.Sets/src/mage/cards/h/HistorianOfZhalfir.java +++ b/Mage.Sets/src/mage/cards/h/HistorianOfZhalfir.java @@ -34,8 +34,8 @@ public final class HistorianOfZhalfir extends CardImpl { // Whenever Historian of Zhalfir attacks, if you control a Teferi planeswalker, draw a card. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new AttacksTriggeredAbility(new DrawCardSourceControllerEffect(1), false), - condition, "Whenever {this} attacks, if you control a Teferi planeswalker, draw a card") - ); + condition, "Whenever {this} attacks, if you control a Teferi planeswalker, draw a card." + )); } private HistorianOfZhalfir(final HistorianOfZhalfir card) { diff --git a/Mage.Sets/src/mage/cards/l/LeafkinAvenger.java b/Mage.Sets/src/mage/cards/l/LeafkinAvenger.java index 587e7d4249..5a1e13ed87 100644 --- a/Mage.Sets/src/mage/cards/l/LeafkinAvenger.java +++ b/Mage.Sets/src/mage/cards/l/LeafkinAvenger.java @@ -27,7 +27,7 @@ import java.util.UUID; */ public final class LeafkinAvenger extends CardImpl { - private static final FilterPermanent filter = new FilterCreaturePermanent("creature you control with power 4 or greater"); + private static final FilterPermanent filter = new FilterCreaturePermanent("creature with power 4 or greater you control"); static { filter.add(new PowerPredicate(ComparisonType.MORE_THAN, 3)); diff --git a/Mage.Sets/src/mage/cards/r/RadhaHeartOfKeld.java b/Mage.Sets/src/mage/cards/r/RadhaHeartOfKeld.java index 64237b8e0e..64203ad551 100644 --- a/Mage.Sets/src/mage/cards/r/RadhaHeartOfKeld.java +++ b/Mage.Sets/src/mage/cards/r/RadhaHeartOfKeld.java @@ -49,9 +49,9 @@ public final class RadhaHeartOfKeld extends CardImpl { // You may look at the top card of your library any time, and you may play lands from the top of your library. LookAtTopCardOfLibraryAnyTimeEffect lookEffect = new LookAtTopCardOfLibraryAnyTimeEffect(); - lookEffect.overrideRuleText("You may look at the top card of your library any time, "); + lookEffect.overrideRuleText("You may look at the top card of your library any time"); PlayTheTopCardEffect playEffect = new PlayTheTopCardEffect(filter); - playEffect.overrideRuleText("and you may play lands from the top of your library"); + playEffect.overrideRuleText(", and you may play lands from the top of your library"); SimpleStaticAbility lookAndPlayAbility = new SimpleStaticAbility(lookEffect); lookAndPlayAbility.addEffect(playEffect); diff --git a/Mage.Sets/src/mage/cards/s/Snarespinner.java b/Mage.Sets/src/mage/cards/s/Snarespinner.java index 86708a456e..d39154b512 100644 --- a/Mage.Sets/src/mage/cards/s/Snarespinner.java +++ b/Mage.Sets/src/mage/cards/s/Snarespinner.java @@ -68,7 +68,7 @@ class SnarespinnerTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever {this} blocks a creature with flying, {this} gets +2/+0 until end of turn"; + return "Whenever {this} blocks a creature with flying, {this} gets +2/+0 until end of turn."; } @Override diff --git a/Mage.Sets/src/mage/cards/s/SpeakerOfTheHeavens.java b/Mage.Sets/src/mage/cards/s/SpeakerOfTheHeavens.java index da068397a0..94f369ee2c 100644 --- a/Mage.Sets/src/mage/cards/s/SpeakerOfTheHeavens.java +++ b/Mage.Sets/src/mage/cards/s/SpeakerOfTheHeavens.java @@ -74,6 +74,6 @@ enum SpeakerOfTheHeavensCondition implements Condition { @Override public String toString() { - return "you have at least 7 more life than your starting life total and only any time you could cast a sorcery"; + return "you have at least 7 life more than your starting life total and only any time you could cast a sorcery"; } } diff --git a/Mage.Sets/src/mage/cards/t/ThievesGuildEnforcer.java b/Mage.Sets/src/mage/cards/t/ThievesGuildEnforcer.java index d1f2608394..e8dd472d8d 100644 --- a/Mage.Sets/src/mage/cards/t/ThievesGuildEnforcer.java +++ b/Mage.Sets/src/mage/cards/t/ThievesGuildEnforcer.java @@ -26,7 +26,7 @@ import java.util.UUID; */ public final class ThievesGuildEnforcer extends CardImpl { - private static final FilterPermanent filter = new FilterPermanent(SubType.ROGUE, "{this} or another Rogue"); + private static final FilterPermanent filter = new FilterPermanent(SubType.ROGUE, "Rogue"); public ThievesGuildEnforcer(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{B}"); diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java index 927ce92715..de2c51c89d 100644 --- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java +++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java @@ -52,7 +52,7 @@ public class VerifyCardDataTest { private static final Logger logger = Logger.getLogger(VerifyCardDataTest.class); - private static final String FULL_ABILITIES_CHECK_SET_CODE = "IKO"; // check all abilities and output cards with wrong abilities texts; + private static final String FULL_ABILITIES_CHECK_SET_CODE = "M21"; // check all abilities and output cards with wrong abilities texts; private static final boolean AUTO_FIX_SAMPLE_DECKS = false; // debug only: fix sample decks if it contains errors like wrong card numbers private static final HashMap> skipCheckLists = new HashMap<>(); diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostOpponentsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostOpponentsEffect.java index 449534640e..1d9aecd51b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostOpponentsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostOpponentsEffect.java @@ -7,6 +7,7 @@ import mage.constants.Duration; import mage.constants.Layer; import mage.constants.Outcome; import mage.constants.SubLayer; +import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -22,7 +23,7 @@ public class BoostOpponentsEffect extends ContinuousEffectImpl { protected FilterCreaturePermanent filter; public BoostOpponentsEffect(int power, int toughness, Duration duration) { - this(power, toughness, duration, new FilterCreaturePermanent("Creatures")); + this(power, toughness, duration, StaticFilters.FILTER_PERMANENT_CREATURES); } public BoostOpponentsEffect(int power, int toughness, Duration duration, FilterCreaturePermanent filter) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutInHandEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutInHandEffect.java index ce9a090df1..645d13e442 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutInHandEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutInHandEffect.java @@ -34,7 +34,7 @@ public class SearchLibraryGraveyardPutInHandEffect extends OneShotEffect { super(Outcome.Benefit); this.filter = filter; this.forceToSearchBoth = forceToSearchBoth; - staticText = (youMay ? "you may" : "") + " search your library and" + (forceToSearchBoth ? "" : "/or") + " graveyard for a card named " + filter.getMessage() + staticText = (youMay ? "you may " : "") + "search your library and" + (forceToSearchBoth ? "" : "/or") + " graveyard for a card named " + filter.getMessage() + ", reveal it, and put it into your hand. " + (forceToSearchBoth ? "Then shuffle your library" : "If you search your library this way, shuffle it"); }