From e91c6ad65ca29cbce7e913562cf3f5e641435e30 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Fri, 18 Feb 2022 10:13:15 -0500 Subject: [PATCH] [SLD] various text fixes --- Mage.Sets/src/mage/cards/a/AjaniTheGreathearted.java | 2 +- Mage.Sets/src/mage/cards/a/ArlinnVoiceOfThePack.java | 2 +- Mage.Sets/src/mage/cards/c/CarpetOfFlowers.java | 2 +- Mage.Sets/src/mage/cards/j/JiangYangguWildcrafter.java | 4 ++-- Mage.Sets/src/mage/cards/k/KayaBaneOfTheDead.java | 2 +- Mage.Sets/src/mage/cards/k/KothophedSoulHoarder.java | 2 +- Mage.Sets/src/mage/cards/l/LilianaDreadhordeGeneral.java | 2 +- Mage.Sets/src/mage/cards/o/ObNixilisTheHateTwisted.java | 2 +- Mage.Sets/src/mage/cards/r/RhysticStudy.java | 2 +- Mage.Sets/src/mage/cards/t/TeferisPuzzleBox.java | 2 +- Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java | 2 +- Mage/src/main/java/mage/abilities/Modes.java | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AjaniTheGreathearted.java b/Mage.Sets/src/mage/cards/a/AjaniTheGreathearted.java index 04fed497279..e30d19de341 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniTheGreathearted.java +++ b/Mage.Sets/src/mage/cards/a/AjaniTheGreathearted.java @@ -51,7 +51,7 @@ public final class AjaniTheGreathearted extends CardImpl { // -2: Put a +1/+1 counter on each creature you control and a loyalty counter on each other planeswalker you control. Ability ability = new LoyaltyAbility(new AddCountersAllEffect( - CounterType.P1P1.createInstance(), StaticFilters.FILTER_CONTROLLED_CREATURES + CounterType.P1P1.createInstance(), StaticFilters.FILTER_CONTROLLED_CREATURE ), -2); ability.addEffect(new AddCountersAllEffect( CounterType.LOYALTY.createInstance(), filter diff --git a/Mage.Sets/src/mage/cards/a/ArlinnVoiceOfThePack.java b/Mage.Sets/src/mage/cards/a/ArlinnVoiceOfThePack.java index c1ea5e18b5e..3b7defc7915 100644 --- a/Mage.Sets/src/mage/cards/a/ArlinnVoiceOfThePack.java +++ b/Mage.Sets/src/mage/cards/a/ArlinnVoiceOfThePack.java @@ -50,7 +50,7 @@ class ArlinnVoiceOfThePackReplacementEffect extends ReplacementEffectImpl { ArlinnVoiceOfThePackReplacementEffect() { super(Duration.WhileOnBattlefield, Outcome.BoostCreature); - staticText = "Each creature you control that's a Wolf or Werewolf " + + staticText = "Each creature you control that's a Wolf or a Werewolf " + "enters the battlefield with an additional +1/+1 counter on it"; } diff --git a/Mage.Sets/src/mage/cards/c/CarpetOfFlowers.java b/Mage.Sets/src/mage/cards/c/CarpetOfFlowers.java index bb5dcc74be4..782d533d055 100644 --- a/Mage.Sets/src/mage/cards/c/CarpetOfFlowers.java +++ b/Mage.Sets/src/mage/cards/c/CarpetOfFlowers.java @@ -120,7 +120,7 @@ class CarpetOfFlowersEffect extends ManaEffect { CarpetOfFlowersEffect() { super(); - staticText = "add X mana of any one color, where X is the number of Islands target opponent controls"; + staticText = "you may add X mana of any one color, where X is the number of Islands target opponent controls"; } CarpetOfFlowersEffect(final CarpetOfFlowersEffect effect) { diff --git a/Mage.Sets/src/mage/cards/j/JiangYangguWildcrafter.java b/Mage.Sets/src/mage/cards/j/JiangYangguWildcrafter.java index 685f63ef6a7..63333e9acd9 100644 --- a/Mage.Sets/src/mage/cards/j/JiangYangguWildcrafter.java +++ b/Mage.Sets/src/mage/cards/j/JiangYangguWildcrafter.java @@ -3,7 +3,7 @@ package mage.cards.j; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; +import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; @@ -31,7 +31,7 @@ public final class JiangYangguWildcrafter extends CardImpl { this.setStartingLoyalty(3); // Each creature you control with a +1/+1 counter on it has "{T}: Add one mana of any color." - this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect( + this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( new AnyColorManaAbility(), Duration.WhileOnBattlefield, StaticFilters.FILTER_EACH_CONTROLLED_CREATURE_P1P1 ))); diff --git a/Mage.Sets/src/mage/cards/k/KayaBaneOfTheDead.java b/Mage.Sets/src/mage/cards/k/KayaBaneOfTheDead.java index a61bb1afb9e..f939d91fc77 100644 --- a/Mage.Sets/src/mage/cards/k/KayaBaneOfTheDead.java +++ b/Mage.Sets/src/mage/cards/k/KayaBaneOfTheDead.java @@ -49,7 +49,7 @@ class KayaBaneOfTheDeadEffect extends AsThoughEffectImpl { KayaBaneOfTheDeadEffect() { super(AsThoughEffectType.HEXPROOF, Duration.WhileOnBattlefield, Outcome.Benefit); - staticText = "your opponents and creatures with hexproof they control " + + staticText = "your opponents and permanents with hexproof your oppponents control " + "can be the targets of spells and abilities you control as though they didn't have hexproof"; } diff --git a/Mage.Sets/src/mage/cards/k/KothophedSoulHoarder.java b/Mage.Sets/src/mage/cards/k/KothophedSoulHoarder.java index 39549524d24..fca295312f4 100644 --- a/Mage.Sets/src/mage/cards/k/KothophedSoulHoarder.java +++ b/Mage.Sets/src/mage/cards/k/KothophedSoulHoarder.java @@ -52,7 +52,7 @@ public final class KothophedSoulHoarder extends CardImpl { Ability ability = new ZoneChangeAllTriggeredAbility(Zone.BATTLEFIELD, Zone.BATTLEFIELD, Zone.GRAVEYARD, effect, filter, "Whenever a permanent owned by another player is put into a graveyard from the battlefield, ", false); effect = new LoseLifeSourceControllerEffect(1); - effect.setText("and lose 1 life"); + effect.setText("and you lose 1 life"); ability.addEffect(effect); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/l/LilianaDreadhordeGeneral.java b/Mage.Sets/src/mage/cards/l/LilianaDreadhordeGeneral.java index 906097c5f7b..69fabb6d9a4 100644 --- a/Mage.Sets/src/mage/cards/l/LilianaDreadhordeGeneral.java +++ b/Mage.Sets/src/mage/cards/l/LilianaDreadhordeGeneral.java @@ -30,7 +30,7 @@ import java.util.UUID; */ public final class LilianaDreadhordeGeneral extends CardImpl { - private static final FilterControlledPermanent filter = new FilterControlledCreaturePermanent(" creatures"); + private static final FilterControlledPermanent filter = new FilterControlledCreaturePermanent("creatures"); public LilianaDreadhordeGeneral(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, "{4}{B}{B}"); diff --git a/Mage.Sets/src/mage/cards/o/ObNixilisTheHateTwisted.java b/Mage.Sets/src/mage/cards/o/ObNixilisTheHateTwisted.java index 993fb79192c..4a592ad3856 100644 --- a/Mage.Sets/src/mage/cards/o/ObNixilisTheHateTwisted.java +++ b/Mage.Sets/src/mage/cards/o/ObNixilisTheHateTwisted.java @@ -32,7 +32,7 @@ public final class ObNixilisTheHateTwisted extends CardImpl { // Whenever an opponent draws a card, Ob Nixilis, the Hate-Twisted deals 1 damage to that player. this.addAbility(new DrawCardOpponentTriggeredAbility(new DamageTargetEffect( - 1, "that player" + 1, true, "that player" ), false, true)); // -2: Destroy target creature. Its controller draws two cards. diff --git a/Mage.Sets/src/mage/cards/r/RhysticStudy.java b/Mage.Sets/src/mage/cards/r/RhysticStudy.java index 53cea2e790d..2a8db1310f4 100644 --- a/Mage.Sets/src/mage/cards/r/RhysticStudy.java +++ b/Mage.Sets/src/mage/cards/r/RhysticStudy.java @@ -27,7 +27,7 @@ public final class RhysticStudy extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}"); // Whenever an opponent casts a spell, you may draw a card unless that player pays {1}. - this.addAbility(new SpellCastOpponentTriggeredAbility(Zone.BATTLEFIELD, new RhysticStudyDrawEffect(), StaticFilters.FILTER_SPELL, false, SetTargetPointer.PLAYER)); + this.addAbility(new SpellCastOpponentTriggeredAbility(Zone.BATTLEFIELD, new RhysticStudyDrawEffect(), StaticFilters.FILTER_SPELL_A, false, SetTargetPointer.PLAYER)); } private RhysticStudy(final RhysticStudy card) { diff --git a/Mage.Sets/src/mage/cards/t/TeferisPuzzleBox.java b/Mage.Sets/src/mage/cards/t/TeferisPuzzleBox.java index 0031ef90fdf..e22774bea9e 100644 --- a/Mage.Sets/src/mage/cards/t/TeferisPuzzleBox.java +++ b/Mage.Sets/src/mage/cards/t/TeferisPuzzleBox.java @@ -42,7 +42,7 @@ class TeferisPuzzleBoxEffect extends OneShotEffect { public TeferisPuzzleBoxEffect() { super(Outcome.Neutral); - staticText = "At the beginning of each player's draw step, that player puts the cards in their hand on the bottom of their library in any order, then draws that many cards"; + staticText = "that player puts the cards in their hand on the bottom of their library in any order, then draws that many cards"; } public TeferisPuzzleBoxEffect(final TeferisPuzzleBoxEffect effect) { diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java index c81cae2becd..347a068678b 100644 --- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java +++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java @@ -62,7 +62,7 @@ public class VerifyCardDataTest { private static final Logger logger = Logger.getLogger(VerifyCardDataTest.class); - private static final String FULL_ABILITIES_CHECK_SET_CODE = "NEO"; // check all abilities and output cards with wrong abilities texts; + private static final String FULL_ABILITIES_CHECK_SET_CODE = "SLD"; // 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 diff --git a/Mage/src/main/java/mage/abilities/Modes.java b/Mage/src/main/java/mage/abilities/Modes.java index b64179d50e9..fc34a14567b 100644 --- a/Mage/src/main/java/mage/abilities/Modes.java +++ b/Mage/src/main/java/mage/abilities/Modes.java @@ -483,7 +483,7 @@ public class Modes extends LinkedHashMap { throw new UnsupportedOperationException("no text available for this selection of min and max modes"); } - if (isEachModeOnlyOnce()) { + if (isEachModeOnlyOnce() && this.getMaxModesFilter() == null) { sb.append(" that hasn't been chosen"); } if (isResetEachTurn()) {