From 6388a81f6943011c12ab3ab46759c5975af8ff7f Mon Sep 17 00:00:00 2001 From: xenohedron Date: Fri, 25 Aug 2023 23:03:06 -0400 Subject: [PATCH] StaticFilters.FILTER_CONTROLLED_PERMANENT_AN_ENCHANTMENT --- Mage.Sets/src/mage/cards/a/AshioksReaper.java | 2 +- Mage.Sets/src/mage/cards/f/FloodtideSerpent.java | 11 ++--------- Mage.Sets/src/mage/cards/g/GeothermalKami.java | 9 +++------ Mage.Sets/src/mage/cards/k/KnightOfDoves.java | 2 +- .../src/mage/cards/n/NevaStalkedByNightmares.java | 8 ++------ Mage.Sets/src/mage/cards/r/RiptideChimera.java | 11 ++--------- Mage.Sets/src/mage/cards/s/SaviorOfTheSleeping.java | 2 +- Mage.Sets/src/mage/cards/s/StarfieldMystic.java | 7 ++----- Mage.Sets/src/mage/cards/w/WarehouseTabby.java | 2 +- Mage.Sets/src/mage/cards/w/WickedVisitor.java | 2 +- Mage/src/main/java/mage/filter/StaticFilters.java | 6 ++++++ 11 files changed, 22 insertions(+), 40 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AshioksReaper.java b/Mage.Sets/src/mage/cards/a/AshioksReaper.java index abc1cafa595..c82e80c85da 100644 --- a/Mage.Sets/src/mage/cards/a/AshioksReaper.java +++ b/Mage.Sets/src/mage/cards/a/AshioksReaper.java @@ -26,7 +26,7 @@ public final class AshioksReaper extends CardImpl { // Whenever an enchantment you control is put into a graveyard from the battlefield, draw a card. this.addAbility(new PutIntoGraveFromBattlefieldAllTriggeredAbility( new DrawCardSourceControllerEffect(1), false, - StaticFilters.FILTER_CONTROLLED_PERMANENT_ENCHANTMENT, false + StaticFilters.FILTER_CONTROLLED_PERMANENT_AN_ENCHANTMENT, false )); } diff --git a/Mage.Sets/src/mage/cards/f/FloodtideSerpent.java b/Mage.Sets/src/mage/cards/f/FloodtideSerpent.java index 715beb800b0..7bc5a934ac7 100644 --- a/Mage.Sets/src/mage/cards/f/FloodtideSerpent.java +++ b/Mage.Sets/src/mage/cards/f/FloodtideSerpent.java @@ -1,4 +1,3 @@ - package mage.cards.f; import java.util.UUID; @@ -12,7 +11,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.filter.common.FilterControlledPermanent; +import mage.filter.StaticFilters; import mage.target.common.TargetControlledPermanent; /** @@ -21,12 +20,6 @@ import mage.target.common.TargetControlledPermanent; */ public final class FloodtideSerpent extends CardImpl { - private static final FilterControlledPermanent filter = new FilterControlledPermanent("an enchantment you control"); - - static { - filter.add(CardType.ENCHANTMENT.getPredicate()); - } - public FloodtideSerpent(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}"); this.subtype.add(SubType.SERPENT); @@ -36,7 +29,7 @@ public final class FloodtideSerpent extends CardImpl { // Floodtide Serpent can't attack unless you return an enchantment you control to its owner's hand (This cost is paid as attackers are declared.) this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockUnlessPaysSourceEffect( - new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(filter)), PayCostToAttackBlockEffectImpl.RestrictType.ATTACK))); + new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_AN_ENCHANTMENT)), PayCostToAttackBlockEffectImpl.RestrictType.ATTACK))); } diff --git a/Mage.Sets/src/mage/cards/g/GeothermalKami.java b/Mage.Sets/src/mage/cards/g/GeothermalKami.java index dad402694f8..8da5c58245c 100644 --- a/Mage.Sets/src/mage/cards/g/GeothermalKami.java +++ b/Mage.Sets/src/mage/cards/g/GeothermalKami.java @@ -9,8 +9,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.filter.common.FilterControlledEnchantmentPermanent; -import mage.filter.common.FilterControlledPermanent; +import mage.filter.StaticFilters; import mage.target.common.TargetControlledPermanent; import java.util.UUID; @@ -20,9 +19,6 @@ import java.util.UUID; */ public final class GeothermalKami extends CardImpl { - private static final FilterControlledPermanent filter - = new FilterControlledEnchantmentPermanent("an enchantment you control"); - public GeothermalKami(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}"); @@ -32,7 +28,8 @@ public final class GeothermalKami extends CardImpl { // When Geothermal Kami enters the battlfield, you may return an enchantment you control to its owner's hand. If you do, you gain 3 life. this.addAbility(new EntersBattlefieldTriggeredAbility(new DoIfCostPaid( - new GainLifeEffect(3), new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(filter)) + new GainLifeEffect(3), new ReturnToHandChosenControlledPermanentCost( + new TargetControlledPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_AN_ENCHANTMENT)) ))); } diff --git a/Mage.Sets/src/mage/cards/k/KnightOfDoves.java b/Mage.Sets/src/mage/cards/k/KnightOfDoves.java index 071a8ab5861..22817bc247d 100644 --- a/Mage.Sets/src/mage/cards/k/KnightOfDoves.java +++ b/Mage.Sets/src/mage/cards/k/KnightOfDoves.java @@ -28,7 +28,7 @@ public final class KnightOfDoves extends CardImpl { // Whenever an enchantment you control is put into a graveyard from the battlefield, create a 1/1 white Bird creature token with flying. this.addAbility(new PutIntoGraveFromBattlefieldAllTriggeredAbility( new CreateTokenEffect(new BirdToken()), false, - StaticFilters.FILTER_CONTROLLED_PERMANENT_ENCHANTMENT, false + StaticFilters.FILTER_CONTROLLED_PERMANENT_AN_ENCHANTMENT, false )); } diff --git a/Mage.Sets/src/mage/cards/n/NevaStalkedByNightmares.java b/Mage.Sets/src/mage/cards/n/NevaStalkedByNightmares.java index 1ee6a8d2d87..2e6578406e7 100644 --- a/Mage.Sets/src/mage/cards/n/NevaStalkedByNightmares.java +++ b/Mage.Sets/src/mage/cards/n/NevaStalkedByNightmares.java @@ -15,8 +15,7 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.counters.CounterType; import mage.filter.FilterCard; -import mage.filter.FilterPermanent; -import mage.filter.common.FilterControlledEnchantmentPermanent; +import mage.filter.StaticFilters; import mage.filter.predicate.Predicates; import mage.target.Target; import mage.target.common.TargetCardInYourGraveyard; @@ -37,9 +36,6 @@ public final class NevaStalkedByNightmares extends CardImpl { )); } - private static final FilterPermanent filter2 - = new FilterControlledEnchantmentPermanent("an enchantment you control"); - public NevaStalkedByNightmares(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}{B}"); @@ -61,7 +57,7 @@ public final class NevaStalkedByNightmares extends CardImpl { // Whenever an enchantment you control is put into a graveyard from the battlefield, put a +1/+1 counter on Neva, then scry 1. ability = new PutIntoGraveFromBattlefieldAllTriggeredAbility( new AddCountersSourceEffect(CounterType.P1P1.createInstance()), - false, filter2, false + false, StaticFilters.FILTER_CONTROLLED_PERMANENT_AN_ENCHANTMENT, false ); ability.addEffect(new ScryEffect(1, false).concatBy(", then")); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RiptideChimera.java b/Mage.Sets/src/mage/cards/r/RiptideChimera.java index 973d0eee1ca..68f0f92c9c2 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideChimera.java +++ b/Mage.Sets/src/mage/cards/r/RiptideChimera.java @@ -1,4 +1,3 @@ - package mage.cards.r; import java.util.UUID; @@ -12,7 +11,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; -import mage.filter.common.FilterControlledPermanent; +import mage.filter.StaticFilters; /** * @@ -20,12 +19,6 @@ import mage.filter.common.FilterControlledPermanent; */ public final class RiptideChimera extends CardImpl { - private static final FilterControlledPermanent filter = new FilterControlledPermanent("an enchantment you control"); - - static { - filter.add(CardType.ENCHANTMENT.getPredicate()); - } - public RiptideChimera(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT, CardType.CREATURE}, "{2}{U}"); this.subtype.add(SubType.CHIMERA); @@ -36,7 +29,7 @@ public final class RiptideChimera extends CardImpl { // Flying this.addAbility(FlyingAbility.getInstance()); // At the beginning of your upkeep, return an enchantment you control to its owner's hand. - Effect effect = new ReturnToHandChosenControlledPermanentEffect(filter, 1); + Effect effect = new ReturnToHandChosenControlledPermanentEffect(StaticFilters.FILTER_CONTROLLED_PERMANENT_AN_ENCHANTMENT, 1); effect.setText("return an enchantment you control to its owner's hand"); this.addAbility(new BeginningOfUpkeepTriggeredAbility(effect, TargetController.YOU, false)); } diff --git a/Mage.Sets/src/mage/cards/s/SaviorOfTheSleeping.java b/Mage.Sets/src/mage/cards/s/SaviorOfTheSleeping.java index 7f9dcad210c..38799e6f369 100644 --- a/Mage.Sets/src/mage/cards/s/SaviorOfTheSleeping.java +++ b/Mage.Sets/src/mage/cards/s/SaviorOfTheSleeping.java @@ -32,7 +32,7 @@ public final class SaviorOfTheSleeping extends CardImpl { // Whenever an enchantment you control is put into a graveyard from the battlefield, put a +1/+1 counter on Savior of the Sleeping. this.addAbility(new PutIntoGraveFromBattlefieldAllTriggeredAbility( new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false, - StaticFilters.FILTER_CONTROLLED_PERMANENT_ENCHANTMENT, false + StaticFilters.FILTER_CONTROLLED_PERMANENT_AN_ENCHANTMENT, false )); } diff --git a/Mage.Sets/src/mage/cards/s/StarfieldMystic.java b/Mage.Sets/src/mage/cards/s/StarfieldMystic.java index 16d947f7ef5..f1b94c5542e 100644 --- a/Mage.Sets/src/mage/cards/s/StarfieldMystic.java +++ b/Mage.Sets/src/mage/cards/s/StarfieldMystic.java @@ -11,8 +11,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.FilterCard; -import mage.filter.FilterPermanent; -import mage.filter.common.FilterControlledEnchantmentPermanent; +import mage.filter.StaticFilters; import mage.filter.common.FilterEnchantmentCard; import java.util.UUID; @@ -24,8 +23,6 @@ public final class StarfieldMystic extends CardImpl { private static final FilterCard filter = new FilterEnchantmentCard("Enchantment spells"); - private static final FilterPermanent filter2 - = new FilterControlledEnchantmentPermanent("an enchantment you control"); public StarfieldMystic(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}"); @@ -41,7 +38,7 @@ public final class StarfieldMystic extends CardImpl { // Whenever an enchantment you control is put into a graveyard from the battlefield, put a +1/+1 counter on Starfield Mystic. this.addAbility(new PutIntoGraveFromBattlefieldAllTriggeredAbility( new AddCountersSourceEffect(CounterType.P1P1.createInstance()), - false, filter2, false + false, StaticFilters.FILTER_CONTROLLED_PERMANENT_AN_ENCHANTMENT, false )); } diff --git a/Mage.Sets/src/mage/cards/w/WarehouseTabby.java b/Mage.Sets/src/mage/cards/w/WarehouseTabby.java index e0afd9abd5d..8888ccf910d 100644 --- a/Mage.Sets/src/mage/cards/w/WarehouseTabby.java +++ b/Mage.Sets/src/mage/cards/w/WarehouseTabby.java @@ -32,7 +32,7 @@ public final class WarehouseTabby extends CardImpl { // Whenever an enchantment you control is put into a graveyard from the battlefield, create a 1/1 black Rat creature token with "This creature can't block." this.addAbility(new PutIntoGraveFromBattlefieldAllTriggeredAbility( new CreateTokenEffect(new RatCantBlockToken()), false, - StaticFilters.FILTER_CONTROLLED_PERMANENT_ENCHANTMENT, false + StaticFilters.FILTER_CONTROLLED_PERMANENT_AN_ENCHANTMENT, false )); // {1}{B}: Warehouse Tabby gains deathtouch until end of turn. diff --git a/Mage.Sets/src/mage/cards/w/WickedVisitor.java b/Mage.Sets/src/mage/cards/w/WickedVisitor.java index 465290090cc..4bb98e771c3 100644 --- a/Mage.Sets/src/mage/cards/w/WickedVisitor.java +++ b/Mage.Sets/src/mage/cards/w/WickedVisitor.java @@ -26,7 +26,7 @@ public final class WickedVisitor extends CardImpl { // Whenever an enchantment you control is put into a graveyard from the battlefield, each opponent loses 1 life. this.addAbility(new PutIntoGraveFromBattlefieldAllTriggeredAbility( new LoseLifeOpponentsEffect(1), false, - StaticFilters.FILTER_CONTROLLED_PERMANENT_ENCHANTMENT, false + StaticFilters.FILTER_CONTROLLED_PERMANENT_AN_ENCHANTMENT, false )); } diff --git a/Mage/src/main/java/mage/filter/StaticFilters.java b/Mage/src/main/java/mage/filter/StaticFilters.java index 529edf54ae8..6ee9a14cea3 100644 --- a/Mage/src/main/java/mage/filter/StaticFilters.java +++ b/Mage/src/main/java/mage/filter/StaticFilters.java @@ -483,6 +483,12 @@ public final class StaticFilters { FILTER_CONTROLLED_PERMANENT_ENCHANTMENT.setLockedFilter(true); } + public static final FilterControlledPermanent FILTER_CONTROLLED_PERMANENT_AN_ENCHANTMENT = new FilterControlledEnchantmentPermanent("an enchantment you control"); + + static { + FILTER_CONTROLLED_PERMANENT_AN_ENCHANTMENT.setLockedFilter(true); + } + public static final FilterControlledPermanent FILTER_CONTROLLED_ANOTHER_ENCHANTMENT_SHORT_TEXT = new FilterControlledPermanent("another enchantment"); static {