diff --git a/Mage.Sets/src/mage/cards/b/BrandedBrawlers.java b/Mage.Sets/src/mage/cards/b/BrandedBrawlers.java index cdc3063fbd0..d7567fc858c 100644 --- a/Mage.Sets/src/mage/cards/b/BrandedBrawlers.java +++ b/Mage.Sets/src/mage/cards/b/BrandedBrawlers.java @@ -31,8 +31,6 @@ public final class BrandedBrawlers extends CardImpl { filter.add(TappedPredicate.UNTAPPED); } - static final private String rule = "{this} can't block if you control an untapped land"; - public BrandedBrawlers(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{R}"); this.subtype.add(SubType.HUMAN); @@ -64,7 +62,7 @@ class BrandedBrawlersCantBlockEffect extends RestrictionEffect { public BrandedBrawlersCantBlockEffect(FilterPermanent filter) { super(Duration.WhileOnBattlefield); this.filter = filter; - staticText = "{this} can't attack if you control " + filter.getMessage(); + staticText = "{this} can't block if you control " + filter.getMessage(); } public BrandedBrawlersCantBlockEffect(final BrandedBrawlersCantBlockEffect effect) { diff --git a/Mage.Sets/src/mage/cards/e/ExperimentKraj.java b/Mage.Sets/src/mage/cards/e/ExperimentKraj.java index f01c7991b9b..9967d4ed624 100644 --- a/Mage.Sets/src/mage/cards/e/ExperimentKraj.java +++ b/Mage.Sets/src/mage/cards/e/ExperimentKraj.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; -import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; @@ -57,7 +56,7 @@ public final class ExperimentKraj extends CardImpl { class ExperimentKrajEffect extends ContinuousEffectImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("each other creature with a +1/+1 counter on it"); static { filter.add(CounterType.P1P1.getPredicate()); diff --git a/Mage.Sets/src/mage/cards/l/LightUpTheStage.java b/Mage.Sets/src/mage/cards/l/LightUpTheStage.java index 9166f4c8223..111a0e26fc1 100644 --- a/Mage.Sets/src/mage/cards/l/LightUpTheStage.java +++ b/Mage.Sets/src/mage/cards/l/LightUpTheStage.java @@ -2,19 +2,11 @@ package mage.cards.l; import mage.abilities.Ability; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.AsThoughEffectImpl; -import mage.abilities.effects.ContinuousEffect; -import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileTopXMayPlayUntilEndOfTurnEffect; import mage.abilities.keyword.SpectacleAbility; -import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; -import mage.game.Game; -import mage.players.Player; -import mage.target.targetpointer.FixedTarget; -import mage.util.CardUtil; import java.util.Set; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/p/PathOfMettle.java b/Mage.Sets/src/mage/cards/p/PathOfMettle.java index 5e3da2ed117..daca6c0fcfd 100644 --- a/Mage.Sets/src/mage/cards/p/PathOfMettle.java +++ b/Mage.Sets/src/mage/cards/p/PathOfMettle.java @@ -26,6 +26,7 @@ public final class PathOfMettle extends CardImpl { private static final FilterCreaturePermanent filterDamage = new FilterCreaturePermanent("creature that doesn't have first strike, double strike, vigilance, or haste"); private static final FilterCreaturePermanent filterTransform = new FilterCreaturePermanent("creatures that have first strike, double strike, vigilance, and/or haste"); + private static final String triggerPhrase = "Whenever you attack with at least two " + filterTransform.getMessage() + ", "; static { filterDamage.add(Predicates.not(Predicates.or( @@ -51,12 +52,11 @@ public final class PathOfMettle extends CardImpl { this.secondSideCardClazz = mage.cards.m.MetzaliTowerOfTriumph.class; // When Path of Mettle enters the battlefield, it deals 1 damage to each creature that doesn't have first strike, double strike, vigilance, or haste. - this.addAbility(new EntersBattlefieldTriggeredAbility(new DamageAllEffect(1, filterDamage))); + this.addAbility(new EntersBattlefieldTriggeredAbility(new DamageAllEffect(1, "it", filterDamage))); // Whenever you attack with at least two creatures that have first strike, double strike, vigilance, and/or haste, transform Path of Mettle. this.addAbility(new TransformAbility()); - this.addAbility(new AttacksWithCreaturesTriggeredAbility(new TransformSourceEffect(), 2, filterTransform) - .setTriggerPhrase("Whenever you attack with at least two creatures that have first strike, double strike, vigilance, and/or haste, ")); + this.addAbility(new AttacksWithCreaturesTriggeredAbility(new TransformSourceEffect(), 2, filterTransform).setTriggerPhrase(triggerPhrase)); } private PathOfMettle(final PathOfMettle card) { diff --git a/Mage.Sets/src/mage/cards/v/VeteranBrawlers.java b/Mage.Sets/src/mage/cards/v/VeteranBrawlers.java index 8e44127cd11..a55ff32d49b 100644 --- a/Mage.Sets/src/mage/cards/v/VeteranBrawlers.java +++ b/Mage.Sets/src/mage/cards/v/VeteranBrawlers.java @@ -31,8 +31,6 @@ public final class VeteranBrawlers extends CardImpl { filter.add(TappedPredicate.UNTAPPED); } - static final private String rule = "{this} can't block if you control an untapped land"; - public VeteranBrawlers(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}"); this.subtype.add(SubType.HUMAN); @@ -64,7 +62,7 @@ class VeteranBrawlersCantBlockEffect extends RestrictionEffect { public VeteranBrawlersCantBlockEffect(FilterPermanent filter) { super(Duration.WhileOnBattlefield); this.filter = filter; - staticText = "{this} can't attack if you control " + filter.getMessage(); + staticText = "{this} can't block if you control " + filter.getMessage(); } public VeteranBrawlersCantBlockEffect(final VeteranBrawlersCantBlockEffect effect) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileTopXMayPlayUntilEndOfTurnEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileTopXMayPlayUntilEndOfTurnEffect.java index 94866e4b5be..14ceac54731 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileTopXMayPlayUntilEndOfTurnEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileTopXMayPlayUntilEndOfTurnEffect.java @@ -73,18 +73,17 @@ public class ExileTopXMayPlayUntilEndOfTurnEffect extends OneShotEffect { if (staticText != null && !staticText.isEmpty()) { return staticText; } - StringBuilder sb = new StringBuilder(); + StringBuilder sb = new StringBuilder("exile the top "); if (amount == 1) { - sb.append("exile the top card of your library. "); - sb.append(CardUtil.getTextWithFirstCharUpperCase(duration.toString())); - sb.append(", you may play that card"); + sb.append("card of your library. "); } else { - sb.append("exile the top "); sb.append(CardUtil.numberToText(amount)); sb.append(" cards of your library. "); - sb.append(CardUtil.getTextWithFirstCharUpperCase(duration.toString())); - sb.append(", you may play cards exiled this way"); } + sb.append(CardUtil.getTextWithFirstCharUpperCase(duration.toString())); + sb.append(", you may play "); + sb.append(amount == 1 ? "that card" : amount == 2 ? "those cards" : "cards exiled this way"); + if (showHint) { sb.append(". (You still pay its costs. You can play a land this way only if you have an available land play remaining.)"); }