diff --git a/Mage.Sets/src/mage/cards/f/FuneralRites.java b/Mage.Sets/src/mage/cards/f/FuneralRites.java index 133370fa9b7..7c12689b3a0 100644 --- a/Mage.Sets/src/mage/cards/f/FuneralRites.java +++ b/Mage.Sets/src/mage/cards/f/FuneralRites.java @@ -23,7 +23,7 @@ public final class FuneralRites extends CardImpl { this.getSpellAbility().addEffect(new LoseLifeSourceControllerEffect(2) .setText(", lose 2 life")); this.getSpellAbility().addEffect(new MillCardsControllerEffect(2) - .concatBy(", and")); + .concatBy(", then")); } private FuneralRites(final FuneralRites card) { diff --git a/Mage.Sets/src/mage/cards/i/Ichthyomorphosis.java b/Mage.Sets/src/mage/cards/i/Ichthyomorphosis.java index d0411d87da8..37493941782 100644 --- a/Mage.Sets/src/mage/cards/i/Ichthyomorphosis.java +++ b/Mage.Sets/src/mage/cards/i/Ichthyomorphosis.java @@ -38,7 +38,7 @@ public final class Ichthyomorphosis extends CardImpl { // Enchanted creature loses all abilities and is a blue Fish with base power and toughness 0/1. Effect effect = new BecomesCreatureAttachedEffect( new CreatureToken(0, 1, "", SubType.FISH).withColor("U"), - "Enchanted creature loses all abilities and is a blue Fish creature with base power and toughness 0/1", + "Enchanted creature loses all abilities and is a blue Fish with base power and toughness 0/1", Duration.WhileOnBattlefield, BecomesCreatureAttachedEffect.LoseType.ALL ); effect.setOutcome(Outcome.Detriment); diff --git a/Mage.Sets/src/mage/cards/i/InspireAwe.java b/Mage.Sets/src/mage/cards/i/InspireAwe.java index 483b60114aa..1887efa7d50 100644 --- a/Mage.Sets/src/mage/cards/i/InspireAwe.java +++ b/Mage.Sets/src/mage/cards/i/InspireAwe.java @@ -29,8 +29,8 @@ public final class InspireAwe extends CardImpl { // Prevent all combat damage that would be dealt this turn except by enchanted creatures and enchantment creatures. Scry 2. this.getSpellAbility().addEffect(new PreventAllDamageByAllPermanentsEffect( filter, Duration.EndOfTurn, true - ).setText("Prevent all combat damage that would be dealt this turn " + - "except by enchanted creatures and enchantment creatures.")); + ).setText("prevent all combat damage that would be dealt this turn except combat damage " + + "that would be dealt by enchanted creatures and enchantment creatures")); this.getSpellAbility().addEffect(new ScryEffect(2)); } diff --git a/Mage.Sets/src/mage/cards/m/MedomaisProphecy.java b/Mage.Sets/src/mage/cards/m/MedomaisProphecy.java index 85079d76fc0..4424a709475 100644 --- a/Mage.Sets/src/mage/cards/m/MedomaisProphecy.java +++ b/Mage.Sets/src/mage/cards/m/MedomaisProphecy.java @@ -61,7 +61,7 @@ class MedomaisProphecyTriggerEffect extends OneShotEffect { MedomaisProphecyTriggerEffect() { super(Outcome.Benefit); - staticText = "When you cast a spell with the chosen card name for the first time this turn, draw two cards."; + staticText = "When you cast a spell with the chosen name for the first time this turn, draw two cards."; } private MedomaisProphecyTriggerEffect(final MedomaisProphecyTriggerEffect effect) { diff --git a/Mage.Sets/src/mage/cards/s/SionaCaptainOfThePyleas.java b/Mage.Sets/src/mage/cards/s/SionaCaptainOfThePyleas.java index f9b6a388f14..aa0f10339fa 100644 --- a/Mage.Sets/src/mage/cards/s/SionaCaptainOfThePyleas.java +++ b/Mage.Sets/src/mage/cards/s/SionaCaptainOfThePyleas.java @@ -95,7 +95,7 @@ class SionaCaptainOfThePyleasAbility extends TriggeredAbilityImpl { @Override public String getRule() { return "Whenever an Aura you control becomes attached to a creature you control, " + - "create a 1/1 white Human Soldier creature token"; + "create a 1/1 white Human Soldier creature token."; } @Override diff --git a/Mage.Sets/src/mage/cards/s/SleepOfTheDead.java b/Mage.Sets/src/mage/cards/s/SleepOfTheDead.java index 0d443a2e442..0a736726d62 100644 --- a/Mage.Sets/src/mage/cards/s/SleepOfTheDead.java +++ b/Mage.Sets/src/mage/cards/s/SleepOfTheDead.java @@ -20,7 +20,7 @@ public final class SleepOfTheDead extends CardImpl { // Tap target creature. It doesn't untap during its controller's next untap step. this.getSpellAbility().addEffect(new TapTargetEffect()); - this.getSpellAbility().addEffect(new DontUntapInControllersNextUntapStepTargetEffect()); + this.getSpellAbility().addEffect(new DontUntapInControllersNextUntapStepTargetEffect("it")); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Escape—{2}{U}, Exile three other cards from your graveyard. diff --git a/Mage.Sets/src/mage/cards/t/TheAkroanWar.java b/Mage.Sets/src/mage/cards/t/TheAkroanWar.java index d96a3790842..8ee54a17572 100644 --- a/Mage.Sets/src/mage/cards/t/TheAkroanWar.java +++ b/Mage.Sets/src/mage/cards/t/TheAkroanWar.java @@ -53,7 +53,7 @@ public final class TheAkroanWar extends CardImpl { SagaChapter.CHAPTER_II, new AttacksIfAbleAllEffect( filter, Duration.UntilYourNextTurn, true - ) + ).setText("until your next turn, creatures your opponents control attack each combat if able") ); // III — Each tapped creature deals damage to itself equal to its power. diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java index c005d7ec727..144ad43f287 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 = "IKO"; // check all abilities and output cards with wrong abilities texts; + private static final String FULL_ABILITIES_CHECK_SET_CODE = "THB"; // 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/effects/common/SacrificeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SacrificeEffect.java index 9115e6ba862..5d210b7086b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/SacrificeEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/SacrificeEffect.java @@ -98,12 +98,12 @@ public class SacrificeEffect extends OneShotEffect { sb.append(" sacrifice "); } } - if (!filter.getMessage().startsWith("another") - && !filter.getMessage().startsWith("a ") - && !filter.getMessage().startsWith("an ")) { - sb.append(CardUtil.numberToText(count.toString(), "a")).append(' '); + if (count.toString().equals("1")) { + sb.append(CardUtil.addArticle(filter.getMessage())); + } else { + sb.append(CardUtil.numberToText(count.toString(), "a")); + sb.append(filter.getMessage()); } - sb.append(filter.getMessage()); staticText = sb.toString(); } }