diff --git a/Mage.Sets/src/mage/cards/a/AngelsTomb.java b/Mage.Sets/src/mage/cards/a/AngelsTomb.java index 9e73e17b2f2..61720dc68cc 100644 --- a/Mage.Sets/src/mage/cards/a/AngelsTomb.java +++ b/Mage.Sets/src/mage/cards/a/AngelsTomb.java @@ -34,7 +34,7 @@ public final class AngelsTomb extends CardImpl { this.addAbility(new EntersBattlefieldControlledTriggeredAbility( Zone.BATTLEFIELD, effect, - StaticFilters.FILTER_PERMANENT_CREATURE_A, + StaticFilters.FILTER_PERMANENT_A_CREATURE, true) ); } diff --git a/Mage.Sets/src/mage/cards/a/AnsweredPrayers.java b/Mage.Sets/src/mage/cards/a/AnsweredPrayers.java index da33f97d183..2ecac4c2238 100644 --- a/Mage.Sets/src/mage/cards/a/AnsweredPrayers.java +++ b/Mage.Sets/src/mage/cards/a/AnsweredPrayers.java @@ -30,7 +30,7 @@ public final class AnsweredPrayers extends CardImpl { // Whenever a creature enters the battlefield under your control, you gain 1 life. If Answered Prayers isn't a creature, it becomes a 3/3 Angel creature with flying in addition to its other types until end of turn. this.addAbility(new EntersBattlefieldControlledTriggeredAbility( - new AnsweredPrayersEffect(), StaticFilters.FILTER_PERMANENT_CREATURE_A + new AnsweredPrayersEffect(), StaticFilters.FILTER_PERMANENT_A_CREATURE )); } diff --git a/Mage.Sets/src/mage/cards/c/CatharsCrusade.java b/Mage.Sets/src/mage/cards/c/CatharsCrusade.java index c3d53f870eb..d9cc61888ba 100644 --- a/Mage.Sets/src/mage/cards/c/CatharsCrusade.java +++ b/Mage.Sets/src/mage/cards/c/CatharsCrusade.java @@ -26,7 +26,7 @@ public final class CatharsCrusade extends CardImpl { this.addAbility(new EntersBattlefieldControlledTriggeredAbility( Zone.BATTLEFIELD, new AddCountersAllEffect(CounterType.P1P1.createInstance(), new FilterControlledCreaturePermanent()), - StaticFilters.FILTER_PERMANENT_CREATURE_A, + StaticFilters.FILTER_PERMANENT_A_CREATURE, false) ); } diff --git a/Mage.Sets/src/mage/cards/d/DecoctionModule.java b/Mage.Sets/src/mage/cards/d/DecoctionModule.java index 21a7694f3b9..cf47d50073a 100644 --- a/Mage.Sets/src/mage/cards/d/DecoctionModule.java +++ b/Mage.Sets/src/mage/cards/d/DecoctionModule.java @@ -29,7 +29,7 @@ public final class DecoctionModule extends CardImpl { this.addAbility(new EntersBattlefieldControlledTriggeredAbility( Zone.BATTLEFIELD, new GetEnergyCountersControllerEffect(1), - StaticFilters.FILTER_PERMANENT_CREATURE_A, + StaticFilters.FILTER_PERMANENT_A_CREATURE, false) ); diff --git a/Mage.Sets/src/mage/cards/d/DreamLeash.java b/Mage.Sets/src/mage/cards/d/DreamLeash.java index f0f15cdb1b7..5b600319397 100644 --- a/Mage.Sets/src/mage/cards/d/DreamLeash.java +++ b/Mage.Sets/src/mage/cards/d/DreamLeash.java @@ -29,6 +29,7 @@ public final class DreamLeash extends CardImpl { // Enchant permanent TargetPermanent auraTarget = new TargetTappedPermanentAsYouCast(); + auraTarget.withChooseHint("must be tapped"); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/cards/e/EnthrallingHold.java b/Mage.Sets/src/mage/cards/e/EnthrallingHold.java index 94ff85687b6..3caa4a63764 100644 --- a/Mage.Sets/src/mage/cards/e/EnthrallingHold.java +++ b/Mage.Sets/src/mage/cards/e/EnthrallingHold.java @@ -30,6 +30,7 @@ public final class EnthrallingHold extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetTappedPermanentAsYouCast(StaticFilters.FILTER_PERMANENT_CREATURE); + auraTarget.withChooseHint("must be tapped"); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); Ability ability = new EnchantAbility(auraTarget.getTargetName()); diff --git a/Mage.Sets/src/mage/cards/k/KaldraCompleat.java b/Mage.Sets/src/mage/cards/k/KaldraCompleat.java index 2167b150181..5316b4c0ae7 100644 --- a/Mage.Sets/src/mage/cards/k/KaldraCompleat.java +++ b/Mage.Sets/src/mage/cards/k/KaldraCompleat.java @@ -65,7 +65,7 @@ public final class KaldraCompleat extends CardImpl { true, false, true, - StaticFilters.FILTER_PERMANENT_CREATURE_A + StaticFilters.FILTER_PERMANENT_A_CREATURE ), AttachmentType.EQUIPMENT, Duration.WhileOnBattlefield, diff --git a/Mage.Sets/src/mage/cards/l/LeylineOfVitality.java b/Mage.Sets/src/mage/cards/l/LeylineOfVitality.java index ceddbc9c130..6d8d57d6df8 100644 --- a/Mage.Sets/src/mage/cards/l/LeylineOfVitality.java +++ b/Mage.Sets/src/mage/cards/l/LeylineOfVitality.java @@ -33,7 +33,7 @@ public final class LeylineOfVitality extends CardImpl { this.addAbility(new EntersBattlefieldControlledTriggeredAbility( Zone.BATTLEFIELD, new GainLifeEffect(1), - StaticFilters.FILTER_PERMANENT_CREATURE_A, + StaticFilters.FILTER_PERMANENT_A_CREATURE, true) ); } diff --git a/Mage.Sets/src/mage/cards/n/NurturingPresence.java b/Mage.Sets/src/mage/cards/n/NurturingPresence.java index 7700cac65d5..e5cae38bfc2 100644 --- a/Mage.Sets/src/mage/cards/n/NurturingPresence.java +++ b/Mage.Sets/src/mage/cards/n/NurturingPresence.java @@ -41,7 +41,7 @@ public final class NurturingPresence extends CardImpl { new EntersBattlefieldControlledTriggeredAbility( new BoostSourceEffect(1, 1, Duration.EndOfTurn) .setText("this creature gets +1/+1 until end of turn"), - StaticFilters.FILTER_PERMANENT_CREATURE_A + StaticFilters.FILTER_PERMANENT_A_CREATURE ), AttachmentType.AURA ))); diff --git a/Mage.Sets/src/mage/cards/s/SeasonOfGrowth.java b/Mage.Sets/src/mage/cards/s/SeasonOfGrowth.java index dcee18948d5..f4a24c3e18e 100644 --- a/Mage.Sets/src/mage/cards/s/SeasonOfGrowth.java +++ b/Mage.Sets/src/mage/cards/s/SeasonOfGrowth.java @@ -29,7 +29,7 @@ public final class SeasonOfGrowth extends CardImpl { // Whenever a creature enters the battlefield under your control, scry 1. this.addAbility(new EntersBattlefieldControlledTriggeredAbility( - new ScryEffect(1), StaticFilters.FILTER_PERMANENT_CREATURE_A + new ScryEffect(1), StaticFilters.FILTER_PERMANENT_A_CREATURE )); // Whenever you cast a spell that targets a creature you control, draw a card. diff --git a/Mage.Sets/src/mage/cards/t/TrialOfAmbition.java b/Mage.Sets/src/mage/cards/t/TrialOfAmbition.java index 0845dfbb300..c6a4dfe0df7 100644 --- a/Mage.Sets/src/mage/cards/t/TrialOfAmbition.java +++ b/Mage.Sets/src/mage/cards/t/TrialOfAmbition.java @@ -31,7 +31,7 @@ public final class TrialOfAmbition extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}"); // When Trial of Ambition enters the battlefield, target opponent sacrifices a creature. - Ability ability = new EntersBattlefieldTriggeredAbility(new SacrificeEffect(StaticFilters.FILTER_PERMANENT_CREATURE_A, 1, "target opponent")); + Ability ability = new EntersBattlefieldTriggeredAbility(new SacrificeEffect(StaticFilters.FILTER_PERMANENT_A_CREATURE, 1, "target opponent")); ability.addTarget(new TargetOpponent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/v/ValorInAkros.java b/Mage.Sets/src/mage/cards/v/ValorInAkros.java index b1aa8d3e395..c26d77bc428 100644 --- a/Mage.Sets/src/mage/cards/v/ValorInAkros.java +++ b/Mage.Sets/src/mage/cards/v/ValorInAkros.java @@ -24,7 +24,7 @@ public final class ValorInAkros extends CardImpl { this.addAbility(new EntersBattlefieldControlledTriggeredAbility( Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.EndOfTurn), - StaticFilters.FILTER_PERMANENT_CREATURE_A, + StaticFilters.FILTER_PERMANENT_A_CREATURE, false) ); } diff --git a/Mage/src/main/java/mage/abilities/common/BecomesBlockedAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BecomesBlockedAllTriggeredAbility.java index e2c08920b2f..fc6228268ec 100644 --- a/Mage/src/main/java/mage/abilities/common/BecomesBlockedAllTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/BecomesBlockedAllTriggeredAbility.java @@ -19,7 +19,7 @@ public class BecomesBlockedAllTriggeredAbility extends TriggeredAbilityImpl { private final boolean setTargetPointer; public BecomesBlockedAllTriggeredAbility(Effect effect, boolean optional) { - this(effect, optional, StaticFilters.FILTER_PERMANENT_CREATURE_A, false); + this(effect, optional, StaticFilters.FILTER_PERMANENT_A_CREATURE, false); } public BecomesBlockedAllTriggeredAbility(Effect effect, boolean optional, FilterCreaturePermanent filter, boolean setTargetPointer) { diff --git a/Mage/src/main/java/mage/filter/StaticFilters.java b/Mage/src/main/java/mage/filter/StaticFilters.java index e79d4711e1e..8158ac24f47 100644 --- a/Mage/src/main/java/mage/filter/StaticFilters.java +++ b/Mage/src/main/java/mage/filter/StaticFilters.java @@ -522,12 +522,6 @@ public final class StaticFilters { FILTER_PERMANENT_CREATURE.setLockedFilter(true); } - public static final FilterCreaturePermanent FILTER_PERMANENT_CREATURE_A = new FilterCreaturePermanent("a creature"); - - static { - FILTER_PERMANENT_CREATURE_A.setLockedFilter(true); - } - public static final FilterPermanent FILTER_PERMANENT_CREATURE_OR_PLANESWALKER_A = new FilterPermanent("a creature or planeswalker"); static { diff --git a/Mage/src/main/java/mage/game/command/emblems/LukkaWaywardBonderEmblem.java b/Mage/src/main/java/mage/game/command/emblems/LukkaWaywardBonderEmblem.java index 7c0b4785a7f..979260212af 100644 --- a/Mage/src/main/java/mage/game/command/emblems/LukkaWaywardBonderEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/LukkaWaywardBonderEmblem.java @@ -23,7 +23,7 @@ public final class LukkaWaywardBonderEmblem extends Emblem { this.setExpansionSetCodeForImage("STX"); Ability ability = new EntersBattlefieldControlledTriggeredAbility( Zone.COMMAND, new LukkaWaywardBonderEmblemEffect(), - StaticFilters.FILTER_PERMANENT_CREATURE_A, false + StaticFilters.FILTER_PERMANENT_A_CREATURE, false ); ability.addTarget(new TargetAnyTarget()); this.getAbilities().add(ability);