diff --git a/Mage.Sets/src/mage/cards/a/ATST.java b/Mage.Sets/src/mage/cards/a/ATST.java index 91ee20c19e..282b2c18be 100644 --- a/Mage.Sets/src/mage/cards/a/ATST.java +++ b/Mage.Sets/src/mage/cards/a/ATST.java @@ -12,7 +12,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -23,7 +22,7 @@ public final class ATST extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Trooper creatures"); static { - filter.add(new SubtypePredicate(SubType.TROOPER)); + filter.add(SubType.TROOPER.getPredicate()); } public ATST(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/Abolish.java b/Mage.Sets/src/mage/cards/a/Abolish.java index 3777d744e8..47d2170ba0 100644 --- a/Mage.Sets/src/mage/cards/a/Abolish.java +++ b/Mage.Sets/src/mage/cards/a/Abolish.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.StaticFilters; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCardInHand; @@ -25,7 +24,7 @@ public final class Abolish extends CardImpl { private static final FilterCard filterCost = new FilterCard("Plains card"); static { - filterCost.add(new SubtypePredicate(SubType.PLAINS)); + filterCost.add(SubType.PLAINS.getPredicate()); } public Abolish(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java b/Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java index f24172edee..201246ec7a 100644 --- a/Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java +++ b/Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java @@ -18,7 +18,6 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; @@ -33,7 +32,7 @@ public final class AboshanCephalidEmperor extends CardImpl { static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("creatures without flying"); static { - filter1.add(new SubtypePredicate(SubType.CEPHALID)); + filter1.add(SubType.CEPHALID.getPredicate()); filter2.add(Predicates.not(new AbilityPredicate(FlyingAbility.class))); } diff --git a/Mage.Sets/src/mage/cards/a/AcademyJourneymage.java b/Mage.Sets/src/mage/cards/a/AcademyJourneymage.java index b2a04b7c8b..cb65e5f8f5 100644 --- a/Mage.Sets/src/mage/cards/a/AcademyJourneymage.java +++ b/Mage.Sets/src/mage/cards/a/AcademyJourneymage.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -28,7 +27,7 @@ public final class AcademyJourneymage extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("you control a Wizard"); static { - filter.add(new SubtypePredicate(SubType.WIZARD)); + filter.add(SubType.WIZARD.getPredicate()); } public AcademyJourneymage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AcademyResearchers.java b/Mage.Sets/src/mage/cards/a/AcademyResearchers.java index 23769cedaf..9a1a2a2968 100644 --- a/Mage.Sets/src/mage/cards/a/AcademyResearchers.java +++ b/Mage.Sets/src/mage/cards/a/AcademyResearchers.java @@ -14,7 +14,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.other.AuraCardCanAttachToPermanentId; import mage.game.Game; import mage.game.permanent.Permanent; @@ -68,7 +67,7 @@ class AcademyResearchersEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { FilterCard filterCardInHand = new FilterCard(); - filterCardInHand.add(new SubtypePredicate(SubType.AURA)); + filterCardInHand.add(SubType.AURA.getPredicate()); Player controller = game.getPlayer(source.getControllerId()); Permanent academyResearchers = game.getPermanent(source.getSourceId()); if (controller != null && academyResearchers != null) { diff --git a/Mage.Sets/src/mage/cards/a/AcclaimedContender.java b/Mage.Sets/src/mage/cards/a/AcclaimedContender.java index 6a1b5383fd..dc306a4c8c 100644 --- a/Mage.Sets/src/mage/cards/a/AcclaimedContender.java +++ b/Mage.Sets/src/mage/cards/a/AcclaimedContender.java @@ -17,7 +17,6 @@ import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; @@ -35,9 +34,9 @@ public final class AcclaimedContender extends CardImpl { static { filter.add(AnotherPredicate.instance); filter2.add(Predicates.or( - new SubtypePredicate(SubType.KNIGHT), - new SubtypePredicate(SubType.AURA), - new SubtypePredicate(SubType.EQUIPMENT), + SubType.KNIGHT.getPredicate(), + SubType.AURA.getPredicate(), + SubType.EQUIPMENT.getPredicate(), Predicates.and( new SupertypePredicate(SuperType.LEGENDARY), CardType.ARTIFACT.getPredicate() diff --git a/Mage.Sets/src/mage/cards/a/AccursedHorde.java b/Mage.Sets/src/mage/cards/a/AccursedHorde.java index 29c99ad77b..1d88002818 100644 --- a/Mage.Sets/src/mage/cards/a/AccursedHorde.java +++ b/Mage.Sets/src/mage/cards/a/AccursedHorde.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetAttackingCreature; /** @@ -27,7 +26,7 @@ public final class AccursedHorde extends CardImpl { private static final FilterAttackingCreature filter = new FilterAttackingCreature("attacking Zombie"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public AccursedHorde(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AcidRain.java b/Mage.Sets/src/mage/cards/a/AcidRain.java index eb143f5e0c..f94da6fbdd 100644 --- a/Mage.Sets/src/mage/cards/a/AcidRain.java +++ b/Mage.Sets/src/mage/cards/a/AcidRain.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -18,7 +17,7 @@ public final class AcidRain extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Forests"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public AcidRain(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java b/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java index d6ee3adf34..7f3de12bd1 100644 --- a/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java +++ b/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -28,7 +27,7 @@ public final class AcidSpewerDragon extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } public AcidSpewerDragon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AcidWebSpider.java b/Mage.Sets/src/mage/cards/a/AcidWebSpider.java index 7a3a6446b1..11bce9c9ba 100644 --- a/Mage.Sets/src/mage/cards/a/AcidWebSpider.java +++ b/Mage.Sets/src/mage/cards/a/AcidWebSpider.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -24,7 +23,7 @@ public final class AcidWebSpider extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Equipment"); static { - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); } public AcidWebSpider (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ActiveVolcano.java b/Mage.Sets/src/mage/cards/a/ActiveVolcano.java index 4497ba90dc..49b2af0dee 100644 --- a/Mage.Sets/src/mage/cards/a/ActiveVolcano.java +++ b/Mage.Sets/src/mage/cards/a/ActiveVolcano.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -25,7 +24,7 @@ public final class ActiveVolcano extends CardImpl { private static final FilterPermanent filterIsland = new FilterPermanent("Island"); static { filterBlue.add(new ColorPredicate(ObjectColor.BLUE)); - filterIsland.add(new SubtypePredicate(SubType.ISLAND)); + filterIsland.add(SubType.ISLAND.getPredicate()); } public ActiveVolcano(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AdelizTheCinderWind.java b/Mage.Sets/src/mage/cards/a/AdelizTheCinderWind.java index c6eeeea5d5..568e4aaabe 100644 --- a/Mage.Sets/src/mage/cards/a/AdelizTheCinderWind.java +++ b/Mage.Sets/src/mage/cards/a/AdelizTheCinderWind.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; @@ -26,7 +25,7 @@ public final class AdelizTheCinderWind extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.WIZARD)); + filter.add(SubType.WIZARD.getPredicate()); } public AdelizTheCinderWind(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AdmiralAckbar.java b/Mage.Sets/src/mage/cards/a/AdmiralAckbar.java index 4efae7d1b3..9779a908ea 100644 --- a/Mage.Sets/src/mage/cards/a/AdmiralAckbar.java +++ b/Mage.Sets/src/mage/cards/a/AdmiralAckbar.java @@ -15,7 +15,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.token.RebelStarshipToken; @@ -29,7 +28,7 @@ public final class AdmiralAckbar extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Starship creatures"); static { - filter.add(new SubtypePredicate(SubType.STARSHIP)); + filter.add(SubType.STARSHIP.getPredicate()); } public AdmiralAckbar(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java b/Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java index 9c1bc82650..19aed1c9ef 100644 --- a/Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java +++ b/Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java @@ -14,7 +14,6 @@ import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterNonlandPermanent; import mage.filter.predicate.Predicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; @@ -33,7 +32,7 @@ public final class AdmiralBeckettBrass extends CardImpl { private static final FilterNonlandPermanent filter2 = new FilterNonlandPermanent("nonland permanent controlled by a player who was dealt combat damage by three or more Pirates this turn"); static { - filter.add(new SubtypePredicate(SubType.PIRATE)); + filter.add(SubType.PIRATE.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); filter2.add(new ControllerDealtDamageByPiratesPredicate()); } diff --git a/Mage.Sets/src/mage/cards/a/AdvocateOfTheBeast.java b/Mage.Sets/src/mage/cards/a/AdvocateOfTheBeast.java index 883681b7b7..3297c71efa 100644 --- a/Mage.Sets/src/mage/cards/a/AdvocateOfTheBeast.java +++ b/Mage.Sets/src/mage/cards/a/AdvocateOfTheBeast.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; @@ -27,7 +26,7 @@ public final class AdvocateOfTheBeast extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Beast creature you control"); static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.BEAST)); + filter.add(SubType.BEAST.getPredicate()); } public AdvocateOfTheBeast(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AerialModification.java b/Mage.Sets/src/mage/cards/a/AerialModification.java index 7deba1505c..3181812acc 100644 --- a/Mage.Sets/src/mage/cards/a/AerialModification.java +++ b/Mage.Sets/src/mage/cards/a/AerialModification.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -29,7 +28,7 @@ public final class AerialModification extends CardImpl { static { filter.add(Predicates.or(CardType.CREATURE.getPredicate(), - new SubtypePredicate(SubType.VEHICLE))); + SubType.VEHICLE.getPredicate())); } public AerialModification(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AeronautAdmiral.java b/Mage.Sets/src/mage/cards/a/AeronautAdmiral.java index 5ae7f11487..988d427c51 100644 --- a/Mage.Sets/src/mage/cards/a/AeronautAdmiral.java +++ b/Mage.Sets/src/mage/cards/a/AeronautAdmiral.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledArtifactPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class AeronautAdmiral extends CardImpl { private static final FilterControlledArtifactPermanent filter = new FilterControlledArtifactPermanent("Vehicles"); static { - filter.add(new SubtypePredicate(SubType.VEHICLE)); + filter.add(SubType.VEHICLE.getPredicate()); } public AeronautAdmiral(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AetherCharge.java b/Mage.Sets/src/mage/cards/a/AetherCharge.java index 091d0f168c..19bae2ec91 100644 --- a/Mage.Sets/src/mage/cards/a/AetherCharge.java +++ b/Mage.Sets/src/mage/cards/a/AetherCharge.java @@ -11,7 +11,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -28,7 +27,7 @@ public final class AetherCharge extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Beast you control"); static { - filter.add(new SubtypePredicate(SubType.BEAST)); + filter.add(SubType.BEAST.getPredicate()); } public AetherCharge(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AetherMeltdown.java b/Mage.Sets/src/mage/cards/a/AetherMeltdown.java index 2f92a98e98..cd738baba4 100644 --- a/Mage.Sets/src/mage/cards/a/AetherMeltdown.java +++ b/Mage.Sets/src/mage/cards/a/AetherMeltdown.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -28,7 +27,7 @@ public final class AetherMeltdown extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("creature or vehicle"); static { - filter.add(Predicates.or(CardType.CREATURE.getPredicate(), new SubtypePredicate(SubType.VEHICLE))); + filter.add(Predicates.or(CardType.CREATURE.getPredicate(), SubType.VEHICLE.getPredicate())); } public AetherMeltdown(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AetherShockwave.java b/Mage.Sets/src/mage/cards/a/AetherShockwave.java index d27f0a86a4..b5fa080791 100644 --- a/Mage.Sets/src/mage/cards/a/AetherShockwave.java +++ b/Mage.Sets/src/mage/cards/a/AetherShockwave.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -21,8 +20,8 @@ public final class AetherShockwave extends CardImpl { private static final FilterCreaturePermanent filterSpirit = new FilterCreaturePermanent("Spirits"); private static final FilterCreaturePermanent filterNonSpirit = new FilterCreaturePermanent("non-Spirit creatures"); static { - filterSpirit.add(new SubtypePredicate(SubType.SPIRIT)); - filterNonSpirit.add(Predicates.not(new SubtypePredicate(SubType.SPIRIT))); + filterSpirit.add(SubType.SPIRIT.getPredicate()); + filterNonSpirit.add(Predicates.not(SubType.SPIRIT.getPredicate())); } public AetherShockwave(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/Aggression.java b/Mage.Sets/src/mage/cards/a/Aggression.java index 78b9408748..3f2aedd7a2 100644 --- a/Mage.Sets/src/mage/cards/a/Aggression.java +++ b/Mage.Sets/src/mage/cards/a/Aggression.java @@ -24,7 +24,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.watchers.common.AttackedThisTurnWatcher; @@ -38,7 +37,7 @@ public final class Aggression extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.WALL))); + filter.add(Predicates.not(SubType.WALL.getPredicate())); } public Aggression(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AirborneAid.java b/Mage.Sets/src/mage/cards/a/AirborneAid.java index 83e527fd70..62e2360071 100644 --- a/Mage.Sets/src/mage/cards/a/AirborneAid.java +++ b/Mage.Sets/src/mage/cards/a/AirborneAid.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -20,7 +19,7 @@ public final class AirborneAid extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Bird on the battlefield"); static { - filter.add(new SubtypePredicate(SubType.BIRD)); + filter.add(SubType.BIRD.getPredicate()); } public AirborneAid(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AirdropCondor.java b/Mage.Sets/src/mage/cards/a/AirdropCondor.java index 824ef1f572..98dc22ee29 100644 --- a/Mage.Sets/src/mage/cards/a/AirdropCondor.java +++ b/Mage.Sets/src/mage/cards/a/AirdropCondor.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetAnyTarget; @@ -29,7 +28,7 @@ public final class AirdropCondor extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a Goblin creature"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public AirdropCondor(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AjaniMentorOfHeroes.java b/Mage.Sets/src/mage/cards/a/AjaniMentorOfHeroes.java index d7231fce44..136612aaa9 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniMentorOfHeroes.java +++ b/Mage.Sets/src/mage/cards/a/AjaniMentorOfHeroes.java @@ -19,7 +19,6 @@ import mage.counters.CounterType; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanentAmount; @@ -35,7 +34,7 @@ public final class AjaniMentorOfHeroes extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); filterCard.add(Predicates.or( - new SubtypePredicate(SubType.AURA), + SubType.AURA.getPredicate(), CardType.CREATURE.getPredicate(), CardType.PLANESWALKER.getPredicate())); } diff --git a/Mage.Sets/src/mage/cards/a/AjanisComrade.java b/Mage.Sets/src/mage/cards/a/AjanisComrade.java index af206b862f..bb5250f3f4 100644 --- a/Mage.Sets/src/mage/cards/a/AjanisComrade.java +++ b/Mage.Sets/src/mage/cards/a/AjanisComrade.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -27,7 +26,7 @@ public final class AjanisComrade extends CardImpl { static { filter.add(CardType.PLANESWALKER.getPredicate()); - filter.add(new SubtypePredicate(SubType.AJANI)); + filter.add(SubType.AJANI.getPredicate()); } public AjanisComrade(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AjanisLastStand.java b/Mage.Sets/src/mage/cards/a/AjanisLastStand.java index 7e6b59f641..6bf4659818 100644 --- a/Mage.Sets/src/mage/cards/a/AjanisLastStand.java +++ b/Mage.Sets/src/mage/cards/a/AjanisLastStand.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; @@ -29,7 +28,7 @@ public final class AjanisLastStand extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent(); static { - filter.add(new SubtypePredicate(SubType.PLAINS)); + filter.add(SubType.PLAINS.getPredicate()); } public AjanisLastStand(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AkoumBattlesinger.java b/Mage.Sets/src/mage/cards/a/AkoumBattlesinger.java index 461b552e13..4a59193391 100644 --- a/Mage.Sets/src/mage/cards/a/AkoumBattlesinger.java +++ b/Mage.Sets/src/mage/cards/a/AkoumBattlesinger.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -25,7 +24,7 @@ public final class AkoumBattlesinger extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("have Ally creatures"); static { - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/a/AkoumFlameseeker.java b/Mage.Sets/src/mage/cards/a/AkoumFlameseeker.java index 5c1c67eea2..4a671ca6c9 100644 --- a/Mage.Sets/src/mage/cards/a/AkoumFlameseeker.java +++ b/Mage.Sets/src/mage/cards/a/AkoumFlameseeker.java @@ -14,7 +14,6 @@ import mage.cards.Cards; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.players.Player; @@ -29,7 +28,7 @@ public final class AkoumFlameseeker extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("an untapped Ally you control"); static { - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/a/AkutaBornOfAsh.java b/Mage.Sets/src/mage/cards/a/AkutaBornOfAsh.java index fddd9d69a5..968e2b625b 100644 --- a/Mage.Sets/src/mage/cards/a/AkutaBornOfAsh.java +++ b/Mage.Sets/src/mage/cards/a/AkutaBornOfAsh.java @@ -15,7 +15,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -26,7 +25,7 @@ public final class AkutaBornOfAsh extends CardImpl { private static final FilterControlledPermanent filterSwamp = new FilterControlledPermanent("a Swamp"); static { - filterSwamp.add(new SubtypePredicate(SubType.SWAMP)); + filterSwamp.add(SubType.SWAMP.getPredicate()); } public AkutaBornOfAsh(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AliBaba.java b/Mage.Sets/src/mage/cards/a/AliBaba.java index cbab6638c1..1b7040abda 100644 --- a/Mage.Sets/src/mage/cards/a/AliBaba.java +++ b/Mage.Sets/src/mage/cards/a/AliBaba.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -25,7 +24,7 @@ public final class AliBaba extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Wall"); static { - filter.add(new SubtypePredicate(SubType.WALL)); + filter.add(SubType.WALL.getPredicate()); } public AliBaba(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AllyEncampment.java b/Mage.Sets/src/mage/cards/a/AllyEncampment.java index 38f5fafb26..180e36cbdf 100644 --- a/Mage.Sets/src/mage/cards/a/AllyEncampment.java +++ b/Mage.Sets/src/mage/cards/a/AllyEncampment.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -30,7 +29,7 @@ public final class AllyEncampment extends CardImpl { private static final FilterSpell FILTER = new FilterSpell("an Ally spell"); static { - FILTER.add(new SubtypePredicate(SubType.ALLY)); + FILTER.add(SubType.ALLY.getPredicate()); } public AllyEncampment(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AlphaKavu.java b/Mage.Sets/src/mage/cards/a/AlphaKavu.java index 1b98013423..bbde2999be 100644 --- a/Mage.Sets/src/mage/cards/a/AlphaKavu.java +++ b/Mage.Sets/src/mage/cards/a/AlphaKavu.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -26,7 +25,7 @@ public final class AlphaKavu extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Kavu creature"); static { - filter.add(new SubtypePredicate(SubType.KAVU)); + filter.add(SubType.KAVU.getPredicate()); } public AlphaKavu(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AmbushCommander.java b/Mage.Sets/src/mage/cards/a/AmbushCommander.java index 3fe4184bea..9670c750ee 100644 --- a/Mage.Sets/src/mage/cards/a/AmbushCommander.java +++ b/Mage.Sets/src/mage/cards/a/AmbushCommander.java @@ -16,9 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.game.permanent.token.TokenImpl; -import mage.game.permanent.token.Token; import mage.game.permanent.token.custom.CreatureToken; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -33,7 +30,7 @@ public final class AmbushCommander extends CardImpl { private static final FilterControlledPermanent filter2 = new FilterControlledPermanent("Forests you control"); static { - filter2.add(new SubtypePredicate(SubType.FOREST)); + filter2.add(SubType.FOREST.getPredicate()); } public AmbushCommander(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AmrouScout.java b/Mage.Sets/src/mage/cards/a/AmrouScout.java index b023f8c0f2..7989fe29c0 100644 --- a/Mage.Sets/src/mage/cards/a/AmrouScout.java +++ b/Mage.Sets/src/mage/cards/a/AmrouScout.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -26,7 +25,7 @@ public final class AmrouScout extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with converted mana cost 3 or less"); static { - filter.add(new SubtypePredicate(SubType.REBEL)); + filter.add(SubType.REBEL.getPredicate()); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); } diff --git a/Mage.Sets/src/mage/cards/a/AnabaAncestor.java b/Mage.Sets/src/mage/cards/a/AnabaAncestor.java index 65a6936cc4..1429764c41 100644 --- a/Mage.Sets/src/mage/cards/a/AnabaAncestor.java +++ b/Mage.Sets/src/mage/cards/a/AnabaAncestor.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; @@ -27,7 +26,7 @@ public final class AnabaAncestor extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Another target Minotaur creature"); static { - filter.add(new SubtypePredicate(SubType.MINOTAUR)); + filter.add(SubType.MINOTAUR.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/a/AnabaSpiritCrafter.java b/Mage.Sets/src/mage/cards/a/AnabaSpiritCrafter.java index d6806216f5..da0297d730 100644 --- a/Mage.Sets/src/mage/cards/a/AnabaSpiritCrafter.java +++ b/Mage.Sets/src/mage/cards/a/AnabaSpiritCrafter.java @@ -12,7 +12,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -23,7 +22,7 @@ public final class AnabaSpiritCrafter extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Minotaur creatures"); static { - filter.add(new SubtypePredicate(SubType.MINOTAUR)); + filter.add(SubType.MINOTAUR.getPredicate()); } public AnabaSpiritCrafter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AncestorsProphet.java b/Mage.Sets/src/mage/cards/a/AncestorsProphet.java index a83a788e70..9ec3cddde6 100644 --- a/Mage.Sets/src/mage/cards/a/AncestorsProphet.java +++ b/Mage.Sets/src/mage/cards/a/AncestorsProphet.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -26,7 +25,7 @@ public final class AncestorsProphet extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Clerics you control"); static { - filter.add(new SubtypePredicate(SubType.CLERIC)); + filter.add(SubType.CLERIC.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/a/AncientAmphitheater.java b/Mage.Sets/src/mage/cards/a/AncientAmphitheater.java index ac09687a09..8a0541f4f2 100644 --- a/Mage.Sets/src/mage/cards/a/AncientAmphitheater.java +++ b/Mage.Sets/src/mage/cards/a/AncientAmphitheater.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; /** @@ -23,7 +22,7 @@ public final class AncientAmphitheater extends CardImpl { private static final FilterCard filter = new FilterCard("a Giant from your hand"); static { - filter.add(new SubtypePredicate(SubType.GIANT)); + filter.add(SubType.GIANT.getPredicate()); } public AncientAmphitheater(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AngelOfFlightAlabaster.java b/Mage.Sets/src/mage/cards/a/AngelOfFlightAlabaster.java index 5efe4321a2..8ddec01daa 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfFlightAlabaster.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfFlightAlabaster.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.Target; import mage.target.common.TargetCardInYourGraveyard; @@ -20,7 +19,7 @@ public final class AngelOfFlightAlabaster extends CardImpl { private static final FilterCard filter = new FilterCard("Spirit card from your graveyard"); static { - filter.add(new SubtypePredicate(SubType.SPIRIT)); + filter.add(SubType.SPIRIT.getPredicate()); } public AngelOfFlightAlabaster(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AngelOfGlorysRise.java b/Mage.Sets/src/mage/cards/a/AngelOfGlorysRise.java index fa078c77d9..282bb280cf 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfGlorysRise.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfGlorysRise.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; @@ -76,7 +75,7 @@ class AngelOfGlorysRiseEffect extends OneShotEffect { .getActivePermanents(new FilterCreaturePermanent(SubType.ZOMBIE, "Zombie"), source.getControllerId(), source.getSourceId(), game)); controller.moveCards(toExile, Zone.EXILED, source, game); FilterCreatureCard filterHuman = new FilterCreatureCard(); - filterHuman.add(new SubtypePredicate(SubType.HUMAN)); + filterHuman.add(SubType.HUMAN.getPredicate()); controller.moveCards(controller.getGraveyard().getCards(filterHuman, game), Zone.BATTLEFIELD, source, game); } return true; diff --git a/Mage.Sets/src/mage/cards/a/AngelicCaptain.java b/Mage.Sets/src/mage/cards/a/AngelicCaptain.java index 3b16d8ebfb..5d66409ebd 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicCaptain.java +++ b/Mage.Sets/src/mage/cards/a/AngelicCaptain.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -25,7 +24,7 @@ public final class AngelicCaptain extends CardImpl { private static final FilterAttackingCreature filter = new FilterAttackingCreature("other attacking Ally"); static { - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/a/AngelicFavor.java b/Mage.Sets/src/mage/cards/a/AngelicFavor.java index 0fb54f8153..fd3c3496a5 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicFavor.java +++ b/Mage.Sets/src/mage/cards/a/AngelicFavor.java @@ -18,7 +18,6 @@ import mage.constants.TurnPhase; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.token.AngelToken; @@ -33,7 +32,7 @@ public final class AngelicFavor extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("If you control a Plains"); static { - filter.add(new SubtypePredicate(SubType.PLAINS)); + filter.add(SubType.PLAINS.getPredicate()); } private static final FilterControlledCreaturePermanent untappedCreatureYouControl = new FilterControlledCreaturePermanent("untapped creature you control"); diff --git a/Mage.Sets/src/mage/cards/a/AngelicOverseer.java b/Mage.Sets/src/mage/cards/a/AngelicOverseer.java index 003ac34d59..0905b3d0d8 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicOverseer.java +++ b/Mage.Sets/src/mage/cards/a/AngelicOverseer.java @@ -17,7 +17,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -30,7 +29,7 @@ public final class AngelicOverseer extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Human"); static { - filter.add(new SubtypePredicate(SubType.HUMAN)); + filter.add(SubType.HUMAN.getPredicate()); } public AngelicOverseer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/Anger.java b/Mage.Sets/src/mage/cards/a/Anger.java index d03be49ecd..c914d1e2e5 100644 --- a/Mage.Sets/src/mage/cards/a/Anger.java +++ b/Mage.Sets/src/mage/cards/a/Anger.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -31,7 +30,7 @@ public final class Anger extends CardImpl { static { filter.add(CardType.LAND.getPredicate()); - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public Anger(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AngrathMinotaurPirate.java b/Mage.Sets/src/mage/cards/a/AngrathMinotaurPirate.java index d4f1f010f2..03b13e6342 100644 --- a/Mage.Sets/src/mage/cards/a/AngrathMinotaurPirate.java +++ b/Mage.Sets/src/mage/cards/a/AngrathMinotaurPirate.java @@ -20,7 +20,6 @@ import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -53,7 +52,7 @@ public final class AngrathMinotaurPirate extends CardImpl { // -3: Return target Pirate card from your graveyard to the battlefield. FilterCard filterPirateCard = new FilterCreatureCard("pirate card from your graveyard"); - filterPirateCard.add(new SubtypePredicate(SubType.PIRATE)); + filterPirateCard.add(SubType.PIRATE.getPredicate()); Ability ability2 = new LoyaltyAbility(new ReturnFromGraveyardToBattlefieldTargetEffect() .setText("Return target Pirate card from your graveyard to the battlefield"), -3); ability2.addTarget(new TargetCardInYourGraveyard(filterPirateCard)); diff --git a/Mage.Sets/src/mage/cards/a/AngrathsAmbusher.java b/Mage.Sets/src/mage/cards/a/AngrathsAmbusher.java index 40efcfd7bc..5d335339b2 100644 --- a/Mage.Sets/src/mage/cards/a/AngrathsAmbusher.java +++ b/Mage.Sets/src/mage/cards/a/AngrathsAmbusher.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class AngrathsAmbusher extends CardImpl { static { filter.add(CardType.PLANESWALKER.getPredicate()); - filter.add(new SubtypePredicate(SubType.ANGRATH)); + filter.add(SubType.ANGRATH.getPredicate()); } public AngrathsAmbusher(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AngryMob.java b/Mage.Sets/src/mage/cards/a/AngryMob.java index c53d131be6..153e45f90f 100644 --- a/Mage.Sets/src/mage/cards/a/AngryMob.java +++ b/Mage.Sets/src/mage/cards/a/AngryMob.java @@ -13,7 +13,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -25,7 +24,7 @@ public final class AngryMob extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Swamps you opponents control"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); filter.add(new ControllerPredicate(TargetController.OPPONENT)); } diff --git a/Mage.Sets/src/mage/cards/a/AnimateWall.java b/Mage.Sets/src/mage/cards/a/AnimateWall.java index 93d9e61007..80be849e48 100644 --- a/Mage.Sets/src/mage/cards/a/AnimateWall.java +++ b/Mage.Sets/src/mage/cards/a/AnimateWall.java @@ -13,7 +13,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -26,7 +25,7 @@ public final class AnimateWall extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Wall"); static { - filter.add(new SubtypePredicate(SubType.WALL)); + filter.add(SubType.WALL.getPredicate()); } public AnimateWall(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AnointedDeacon.java b/Mage.Sets/src/mage/cards/a/AnointedDeacon.java index 2bce9468a4..74d7b9950a 100644 --- a/Mage.Sets/src/mage/cards/a/AnointedDeacon.java +++ b/Mage.Sets/src/mage/cards/a/AnointedDeacon.java @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -22,7 +21,7 @@ public final class AnointedDeacon extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Vampire"); static { - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); } public AnointedDeacon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AnowonTheRuinSage.java b/Mage.Sets/src/mage/cards/a/AnowonTheRuinSage.java index 4cfd14394d..5f035ab83b 100644 --- a/Mage.Sets/src/mage/cards/a/AnowonTheRuinSage.java +++ b/Mage.Sets/src/mage/cards/a/AnowonTheRuinSage.java @@ -13,7 +13,6 @@ import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class AnowonTheRuinSage extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("non-Vampire creature"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.VAMPIRE))); + filter.add(Predicates.not(SubType.VAMPIRE.getPredicate())); } public AnowonTheRuinSage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AphettoDredging.java b/Mage.Sets/src/mage/cards/a/AphettoDredging.java index 9309b1bd80..a644ad5885 100644 --- a/Mage.Sets/src/mage/cards/a/AphettoDredging.java +++ b/Mage.Sets/src/mage/cards/a/AphettoDredging.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; @@ -55,7 +54,7 @@ enum AphettoDredgingAdjuster implements TargetAdjuster { if (controller != null && controller.choose(Outcome.PutCreatureInPlay, typeChoice, game)) { String chosenType = typeChoice.getChoice(); FilterCreatureCard filter = new FilterCreatureCard(chosenType + " cards"); - filter.add(new SubtypePredicate(SubType.byDescription(chosenType))); + filter.add(SubType.byDescription(chosenType).getPredicate()); ability.addTarget(new TargetCardInYourGraveyard(0, 3, filter)); } } diff --git a/Mage.Sets/src/mage/cards/a/AphettoGrifter.java b/Mage.Sets/src/mage/cards/a/AphettoGrifter.java index c1e7324741..fd7155e2ee 100644 --- a/Mage.Sets/src/mage/cards/a/AphettoGrifter.java +++ b/Mage.Sets/src/mage/cards/a/AphettoGrifter.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; @@ -29,7 +28,7 @@ public final class AphettoGrifter extends CardImpl { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new SubtypePredicate(SubType.WIZARD)); + filter.add(SubType.WIZARD.getPredicate()); } public AphettoGrifter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AphettoVulture.java b/Mage.Sets/src/mage/cards/a/AphettoVulture.java index c849985052..f62b8b9f22 100644 --- a/Mage.Sets/src/mage/cards/a/AphettoVulture.java +++ b/Mage.Sets/src/mage/cards/a/AphettoVulture.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInYourGraveyard; /** @@ -24,7 +23,7 @@ public final class AphettoVulture extends CardImpl { private static final FilterCard filter = new FilterCard("Zombie card from your graveyard"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public AphettoVulture(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ApothecaryGeist.java b/Mage.Sets/src/mage/cards/a/ApothecaryGeist.java index a4cbd66ee7..62d1af970e 100644 --- a/Mage.Sets/src/mage/cards/a/ApothecaryGeist.java +++ b/Mage.Sets/src/mage/cards/a/ApothecaryGeist.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import java.util.UUID; @@ -28,7 +27,7 @@ public final class ApothecaryGeist extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new SubtypePredicate(SubType.SPIRIT)); + filter.add(SubType.SPIRIT.getPredicate()); } public ApothecaryGeist(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AquaticIncursion.java b/Mage.Sets/src/mage/cards/a/AquaticIncursion.java index 15199eb5b8..ebd109ee3f 100644 --- a/Mage.Sets/src/mage/cards/a/AquaticIncursion.java +++ b/Mage.Sets/src/mage/cards/a/AquaticIncursion.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.MerfolkHexproofToken; import mage.target.TargetPermanent; @@ -28,7 +27,7 @@ public final class AquaticIncursion extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Merfolk"); static { - filter.add(new SubtypePredicate(SubType.MERFOLK)); + filter.add(SubType.MERFOLK.getPredicate()); } public AquaticIncursion(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AquitectsWill.java b/Mage.Sets/src/mage/cards/a/AquitectsWill.java index b9b1d00d7f..3de1719065 100644 --- a/Mage.Sets/src/mage/cards/a/AquitectsWill.java +++ b/Mage.Sets/src/mage/cards/a/AquitectsWill.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetLandPermanent; @@ -28,7 +27,7 @@ public final class AquitectsWill extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Merfolk"); static { - filter.add(new SubtypePredicate(SubType.MERFOLK)); + filter.add(SubType.MERFOLK.getPredicate()); } public AquitectsWill(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/Arachnogenesis.java b/Mage.Sets/src/mage/cards/a/Arachnogenesis.java index 6ae7302782..410123d886 100644 --- a/Mage.Sets/src/mage/cards/a/Arachnogenesis.java +++ b/Mage.Sets/src/mage/cards/a/Arachnogenesis.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.combat.CombatGroup; import mage.game.permanent.token.SpiderToken; @@ -28,7 +27,7 @@ public final class Arachnogenesis extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Spider creatures"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.SPIDER))); + filter.add(Predicates.not(SubType.SPIDER.getPredicate())); } public Arachnogenesis(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java b/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java index 3c4d17cc49..069581b30b 100644 --- a/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java +++ b/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java @@ -19,7 +19,6 @@ import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -38,7 +37,7 @@ public final class ArachnusSpinner extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Spider you control"); static { - filter.add(new SubtypePredicate(SubType.SPIDER)); + filter.add(SubType.SPIDER.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/a/ArahboRoarOfTheWorld.java b/Mage.Sets/src/mage/cards/a/ArahboRoarOfTheWorld.java index c0b9086041..7c5b46c6af 100644 --- a/Mage.Sets/src/mage/cards/a/ArahboRoarOfTheWorld.java +++ b/Mage.Sets/src/mage/cards/a/ArahboRoarOfTheWorld.java @@ -19,7 +19,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; @@ -39,10 +38,10 @@ public final class ArahboRoarOfTheWorld extends CardImpl { private static final FilterControlledCreaturePermanent filter2 = new FilterControlledCreaturePermanent("another Cat you control"); static { - filter.add(new SubtypePredicate(SubType.CAT)); + filter.add(SubType.CAT.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(AnotherPredicate.instance); - filter2.add(new SubtypePredicate(SubType.CAT)); + filter2.add(SubType.CAT.getPredicate()); filter2.add(new ControllerPredicate(TargetController.YOU)); filter2.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/a/ArashinForemost.java b/Mage.Sets/src/mage/cards/a/ArashinForemost.java index 2fbb32c68a..0d5f8340b7 100644 --- a/Mage.Sets/src/mage/cards/a/ArashinForemost.java +++ b/Mage.Sets/src/mage/cards/a/ArashinForemost.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -26,7 +25,7 @@ public final class ArashinForemost extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another target Warrior creature you control"); static { - filter.add(new SubtypePredicate(SubType.WARRIOR)); + filter.add(SubType.WARRIOR.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/a/ArchangelAvacyn.java b/Mage.Sets/src/mage/cards/a/ArchangelAvacyn.java index cc804d4fa3..97b3609328 100644 --- a/Mage.Sets/src/mage/cards/a/ArchangelAvacyn.java +++ b/Mage.Sets/src/mage/cards/a/ArchangelAvacyn.java @@ -19,7 +19,6 @@ import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -34,7 +33,7 @@ public final class ArchangelAvacyn extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a non-Angel creature you control"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.ANGEL))); + filter.add(Predicates.not(SubType.ANGEL.getPredicate())); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/a/ArchdemonOfGreed.java b/Mage.Sets/src/mage/cards/a/ArchdemonOfGreed.java index 14f6f702ab..6576c2bcd4 100644 --- a/Mage.Sets/src/mage/cards/a/ArchdemonOfGreed.java +++ b/Mage.Sets/src/mage/cards/a/ArchdemonOfGreed.java @@ -15,7 +15,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -32,7 +31,7 @@ public final class ArchdemonOfGreed extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Human"); static { - filter.add(new SubtypePredicate(SubType.HUMAN)); + filter.add(SubType.HUMAN.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/a/ArchdemonOfUnx.java b/Mage.Sets/src/mage/cards/a/ArchdemonOfUnx.java index 1f53916274..46e364f9c7 100644 --- a/Mage.Sets/src/mage/cards/a/ArchdemonOfUnx.java +++ b/Mage.Sets/src/mage/cards/a/ArchdemonOfUnx.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.ZombieToken; /** @@ -28,7 +27,7 @@ public final class ArchdemonOfUnx extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Zombie creature"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.ZOMBIE))); + filter.add(Predicates.not(SubType.ZOMBIE.getPredicate())); } public ArchdemonOfUnx(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ArchwayAngel.java b/Mage.Sets/src/mage/cards/a/ArchwayAngel.java index ebab4bd07d..3317669ebc 100644 --- a/Mage.Sets/src/mage/cards/a/ArchwayAngel.java +++ b/Mage.Sets/src/mage/cards/a/ArchwayAngel.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -26,7 +25,7 @@ public final class ArchwayAngel extends CardImpl { private static final FilterPermanent filter = new FilterControlledPermanent("Gate you control"); static { - filter.add(new SubtypePredicate(SubType.GATE)); + filter.add(SubType.GATE.getPredicate()); } public ArchwayAngel(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ArcticAven.java b/Mage.Sets/src/mage/cards/a/ArcticAven.java index 95d002c745..f2e235dd4e 100644 --- a/Mage.Sets/src/mage/cards/a/ArcticAven.java +++ b/Mage.Sets/src/mage/cards/a/ArcticAven.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -28,7 +27,7 @@ public final class ArcticAven extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Plains"); static { - filter.add(new SubtypePredicate(SubType.PLAINS)); + filter.add(SubType.PLAINS.getPredicate()); } public ArcticAven(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ArmamentMaster.java b/Mage.Sets/src/mage/cards/a/ArmamentMaster.java index 9ca578984b..02e4d1ea1b 100644 --- a/Mage.Sets/src/mage/cards/a/ArmamentMaster.java +++ b/Mage.Sets/src/mage/cards/a/ArmamentMaster.java @@ -9,7 +9,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -25,7 +24,7 @@ public final class ArmamentMaster extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Other Kor creatures you control"); static { - filter.add(new SubtypePredicate(SubType.KOR)); + filter.add(SubType.KOR.getPredicate()); } public ArmamentMaster(UUID ownerId, CardSetInfo setInfo) { @@ -54,7 +53,7 @@ class ArmamentMasterEffect extends ContinuousEffectImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Other Kor creatures you control"); static { - filter.add(new SubtypePredicate(SubType.KOR)); + filter.add(SubType.KOR.getPredicate()); } public ArmamentMasterEffect() { diff --git a/Mage.Sets/src/mage/cards/a/ArmedResponse.java b/Mage.Sets/src/mage/cards/a/ArmedResponse.java index 3f51463c34..e57346f044 100644 --- a/Mage.Sets/src/mage/cards/a/ArmedResponse.java +++ b/Mage.Sets/src/mage/cards/a/ArmedResponse.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledArtifactPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetAttackingCreature; /** @@ -22,7 +21,7 @@ public final class ArmedResponse extends CardImpl { private static final FilterControlledArtifactPermanent filter = new FilterControlledArtifactPermanent("Equipment you control"); static { - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/a/ArmoredAscension.java b/Mage.Sets/src/mage/cards/a/ArmoredAscension.java index f51c93ebcc..baccfb13c9 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredAscension.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredAscension.java @@ -13,7 +13,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -27,7 +26,7 @@ public final class ArmoredAscension extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Plains you control"); static { - filter.add(new SubtypePredicate(SubType.PLAINS)); + filter.add(SubType.PLAINS.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/a/ArmoryAutomaton.java b/Mage.Sets/src/mage/cards/a/ArmoryAutomaton.java index f56d6acc10..9b5d858a9b 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoryAutomaton.java +++ b/Mage.Sets/src/mage/cards/a/ArmoryAutomaton.java @@ -13,7 +13,6 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardIdPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AttachedToPredicate; import mage.filter.predicate.permanent.PermanentIdPredicate; import mage.game.Game; @@ -55,7 +54,7 @@ class ArmoryAutomatonEffect extends OneShotEffect { private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("Equipment"); static { - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); } public ArmoryAutomatonEffect() { diff --git a/Mage.Sets/src/mage/cards/a/ArmoryGuard.java b/Mage.Sets/src/mage/cards/a/ArmoryGuard.java index 43641e4590..9eae531721 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoryGuard.java +++ b/Mage.Sets/src/mage/cards/a/ArmoryGuard.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -27,7 +26,7 @@ public final class ArmoryGuard extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Gate"); static { - filter.add(new SubtypePredicate(SubType.GATE)); + filter.add(SubType.GATE.getPredicate()); } public ArmoryGuard(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ArmsDealer.java b/Mage.Sets/src/mage/cards/a/ArmsDealer.java index 47d7b4ad14..5cb848edab 100644 --- a/Mage.Sets/src/mage/cards/a/ArmsDealer.java +++ b/Mage.Sets/src/mage/cards/a/ArmsDealer.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -26,7 +25,7 @@ public final class ArmsDealer extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Goblin"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public ArmsDealer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ArterialFlow.java b/Mage.Sets/src/mage/cards/a/ArterialFlow.java index 7cd6f7bfa2..ddf37f530a 100644 --- a/Mage.Sets/src/mage/cards/a/ArterialFlow.java +++ b/Mage.Sets/src/mage/cards/a/ArterialFlow.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class ArterialFlow extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("If you control a Vampire,"); static { - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); } public ArterialFlow(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/ArtificersHex.java b/Mage.Sets/src/mage/cards/a/ArtificersHex.java index 43de56ba69..76d2cc45a3 100644 --- a/Mage.Sets/src/mage/cards/a/ArtificersHex.java +++ b/Mage.Sets/src/mage/cards/a/ArtificersHex.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -25,7 +24,7 @@ public final class ArtificersHex extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Equipment"); static { filter.add(CardType.ARTIFACT.getPredicate()); - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); } public ArtificersHex(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AryelKnightOfWindgrace.java b/Mage.Sets/src/mage/cards/a/AryelKnightOfWindgrace.java index b260e58011..c0bc80c3b7 100644 --- a/Mage.Sets/src/mage/cards/a/AryelKnightOfWindgrace.java +++ b/Mage.Sets/src/mage/cards/a/AryelKnightOfWindgrace.java @@ -24,7 +24,6 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.token.KnightToken; @@ -81,7 +80,7 @@ class AryelTapXTargetCost extends VariableCostImpl { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new SubtypePredicate(SubType.KNIGHT)); + filter.add(SubType.KNIGHT.getPredicate()); } public AryelTapXTargetCost() { diff --git a/Mage.Sets/src/mage/cards/a/AspectOfWolf.java b/Mage.Sets/src/mage/cards/a/AspectOfWolf.java index fb4fd123d2..96d862c474 100644 --- a/Mage.Sets/src/mage/cards/a/AspectOfWolf.java +++ b/Mage.Sets/src/mage/cards/a/AspectOfWolf.java @@ -13,7 +13,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -55,7 +54,7 @@ class HalfForestsDownCount implements DynamicValue { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } @Override @@ -85,7 +84,7 @@ class HalfForestsUpCount implements DynamicValue { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } @Override diff --git a/Mage.Sets/src/mage/cards/a/AssemblyWorker.java b/Mage.Sets/src/mage/cards/a/AssemblyWorker.java index c3cd6943ca..0c92a508f2 100644 --- a/Mage.Sets/src/mage/cards/a/AssemblyWorker.java +++ b/Mage.Sets/src/mage/cards/a/AssemblyWorker.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -26,7 +25,7 @@ public final class AssemblyWorker extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Assembly-Worker creature"); static { - filter.add(new SubtypePredicate(SubType.ASSEMBLY_WORKER)); + filter.add(SubType.ASSEMBLY_WORKER.getPredicate()); } public AssemblyWorker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AstromechDroid.java b/Mage.Sets/src/mage/cards/a/AstromechDroid.java index 492a15aa25..8b92513ddb 100644 --- a/Mage.Sets/src/mage/cards/a/AstromechDroid.java +++ b/Mage.Sets/src/mage/cards/a/AstromechDroid.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -28,7 +27,7 @@ public final class AstromechDroid extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("starship creature"); static { - filter.add(new SubtypePredicate(SubType.STARSHIP)); + filter.add(SubType.STARSHIP.getPredicate()); } public AstromechDroid(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AtarkaWorldRender.java b/Mage.Sets/src/mage/cards/a/AtarkaWorldRender.java index 8865e07f43..0c8abce96b 100644 --- a/Mage.Sets/src/mage/cards/a/AtarkaWorldRender.java +++ b/Mage.Sets/src/mage/cards/a/AtarkaWorldRender.java @@ -13,7 +13,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -58,7 +57,7 @@ class AtarkaWorldRenderEffect extends TriggeredAbilityImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("dragon you control"); static { - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } public AtarkaWorldRenderEffect() { diff --git a/Mage.Sets/src/mage/cards/a/Atogatog.java b/Mage.Sets/src/mage/cards/a/Atogatog.java index 0f17b1a8a0..db546c4644 100644 --- a/Mage.Sets/src/mage/cards/a/Atogatog.java +++ b/Mage.Sets/src/mage/cards/a/Atogatog.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -26,7 +25,7 @@ public final class Atogatog extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.ATOG)); + filter.add(SubType.ATOG.getPredicate()); } public Atogatog(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AttendantOfVraska.java b/Mage.Sets/src/mage/cards/a/AttendantOfVraska.java index fec4d35646..96765554d0 100644 --- a/Mage.Sets/src/mage/cards/a/AttendantOfVraska.java +++ b/Mage.Sets/src/mage/cards/a/AttendantOfVraska.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -27,7 +26,7 @@ public final class AttendantOfVraska extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(CardType.PLANESWALKER.getPredicate()); - filter.add(new SubtypePredicate(SubType.VRASKA)); + filter.add(SubType.VRASKA.getPredicate()); } public AttendantOfVraska(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AtzocanSeer.java b/Mage.Sets/src/mage/cards/a/AtzocanSeer.java index dfa85c2575..853633997b 100644 --- a/Mage.Sets/src/mage/cards/a/AtzocanSeer.java +++ b/Mage.Sets/src/mage/cards/a/AtzocanSeer.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInYourGraveyard; /** @@ -26,7 +25,7 @@ public final class AtzocanSeer extends CardImpl { private static final FilterCard filter = new FilterCard("Dinosaur from your graveyard"); static { - filter.add(new SubtypePredicate(SubType.DINOSAUR)); + filter.add(SubType.DINOSAUR.getPredicate()); } public AtzocanSeer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AuntiesHovel.java b/Mage.Sets/src/mage/cards/a/AuntiesHovel.java index 3974ec2457..fe430cf7f9 100644 --- a/Mage.Sets/src/mage/cards/a/AuntiesHovel.java +++ b/Mage.Sets/src/mage/cards/a/AuntiesHovel.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; /** @@ -23,7 +22,7 @@ public final class AuntiesHovel extends CardImpl { private static final FilterCard filter = new FilterCard("a Goblin card from your hand"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public AuntiesHovel(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AuntiesSnitch.java b/Mage.Sets/src/mage/cards/a/AuntiesSnitch.java index fdacf7e1cd..360a7d5c74 100644 --- a/Mage.Sets/src/mage/cards/a/AuntiesSnitch.java +++ b/Mage.Sets/src/mage/cards/a/AuntiesSnitch.java @@ -15,7 +15,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; @@ -60,7 +59,7 @@ class AuntiesSnitchTriggeredAbility extends TriggeredAbilityImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Goblin or Rogue you control"); static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(Predicates.or(new SubtypePredicate(SubType.GOBLIN), new SubtypePredicate(SubType.ROGUE))); + filter.add(Predicates.or(SubType.GOBLIN.getPredicate(), SubType.ROGUE.getPredicate())); } public AuntiesSnitchTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/a/AuraBarbs.java b/Mage.Sets/src/mage/cards/a/AuraBarbs.java index 648fab56ee..baadd4d356 100644 --- a/Mage.Sets/src/mage/cards/a/AuraBarbs.java +++ b/Mage.Sets/src/mage/cards/a/AuraBarbs.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -64,7 +63,7 @@ public final class AuraBarbs extends CardImpl { } } - filterEnchantments.add(new SubtypePredicate(SubType.AURA)); + filterEnchantments.add(SubType.AURA.getPredicate()); for (Permanent auraEnchantment : game.getBattlefield().getActivePermanents(filterEnchantments, source.getControllerId(), source.getSourceId(), game)) { if (auraEnchantment.getAttachedTo() != null) { Permanent attachedToCreature = game.getPermanent(auraEnchantment.getAttachedTo()); diff --git a/Mage.Sets/src/mage/cards/a/AuraFinesse.java b/Mage.Sets/src/mage/cards/a/AuraFinesse.java index 13e6472745..0066eea9f1 100644 --- a/Mage.Sets/src/mage/cards/a/AuraFinesse.java +++ b/Mage.Sets/src/mage/cards/a/AuraFinesse.java @@ -12,7 +12,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterEnchantmentPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -31,7 +30,7 @@ public final class AuraFinesse extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); } public AuraFinesse(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AuraGnarlid.java b/Mage.Sets/src/mage/cards/a/AuraGnarlid.java index 249ccaefa9..a98ac340cd 100644 --- a/Mage.Sets/src/mage/cards/a/AuraGnarlid.java +++ b/Mage.Sets/src/mage/cards/a/AuraGnarlid.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -25,7 +24,7 @@ public final class AuraGnarlid extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Aura on the battlefield"); static { - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); } public AuraGnarlid(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AuraGraft.java b/Mage.Sets/src/mage/cards/a/AuraGraft.java index 7e0293246c..541188a441 100644 --- a/Mage.Sets/src/mage/cards/a/AuraGraft.java +++ b/Mage.Sets/src/mage/cards/a/AuraGraft.java @@ -16,7 +16,6 @@ import mage.filter.Filter; import mage.filter.FilterPermanent; import mage.filter.predicate.ObjectPlayer; import mage.filter.predicate.ObjectPlayerPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -35,7 +34,7 @@ public final class AuraGraft extends CardImpl { // Gain control of target Aura that's attached to a permanent. Attach it to another permanent it can enchant. FilterPermanent filter = new FilterPermanent("Aura that's attached to a permanent"); - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); filter.add(new AttachedToPermanentPredicate()); this.getSpellAbility().addTarget(new TargetPermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/a/AuratouchedMage.java b/Mage.Sets/src/mage/cards/a/AuratouchedMage.java index 7cb38b3de8..3b5d13d165 100644 --- a/Mage.Sets/src/mage/cards/a/AuratouchedMage.java +++ b/Mage.Sets/src/mage/cards/a/AuratouchedMage.java @@ -12,7 +12,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.other.AuraCardCanAttachToLKIPermanentId; import mage.game.Game; import mage.game.permanent.Permanent; @@ -65,7 +64,7 @@ class AuratouchedMageEffect extends OneShotEffect { if (controller != null) { FilterCard filter = new FilterCard("aura that could enchant " + source.getSourceObject(game).getName()); - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); filter.add(new AuraCardCanAttachToLKIPermanentId(source.getSourceId())); TargetCardInLibrary target = new TargetCardInLibrary(filter); target.setNotTarget(true); diff --git a/Mage.Sets/src/mage/cards/a/AuriokSteelshaper.java b/Mage.Sets/src/mage/cards/a/AuriokSteelshaper.java index f3091ed73f..8a0b8dd896 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokSteelshaper.java +++ b/Mage.Sets/src/mage/cards/a/AuriokSteelshaper.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -30,8 +29,8 @@ public final class AuriokSteelshaper extends CardImpl { static { soldiersOrKnights.add(Predicates.or( - new SubtypePredicate(SubType.SOLDIER), - new SubtypePredicate(SubType.KNIGHT) + SubType.SOLDIER.getPredicate(), + SubType.KNIGHT.getPredicate() )); } diff --git a/Mage.Sets/src/mage/cards/a/AuriokSurvivors.java b/Mage.Sets/src/mage/cards/a/AuriokSurvivors.java index 10f0d5145e..e52e37a0d4 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokSurvivors.java +++ b/Mage.Sets/src/mage/cards/a/AuriokSurvivors.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -27,7 +26,7 @@ public final class AuriokSurvivors extends CardImpl { private static final FilterCard filter = new FilterCard("Equipment card from your graveyard"); static { - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); } public AuriokSurvivors(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AuriokWindwalker.java b/Mage.Sets/src/mage/cards/a/AuriokWindwalker.java index 402b90bb82..1df14430c8 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokWindwalker.java +++ b/Mage.Sets/src/mage/cards/a/AuriokWindwalker.java @@ -15,7 +15,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; @@ -30,7 +29,7 @@ public final class AuriokWindwalker extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Equipment you control"); static { - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); } public AuriokWindwalker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/Aurochs.java b/Mage.Sets/src/mage/cards/a/Aurochs.java index 4960ec3865..06f3e248b8 100644 --- a/Mage.Sets/src/mage/cards/a/Aurochs.java +++ b/Mage.Sets/src/mage/cards/a/Aurochs.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -26,7 +25,7 @@ public final class Aurochs extends CardImpl { private static final FilterAttackingCreature filter1 = new FilterAttackingCreature("other attacking Aurochs"); static { - filter1.add(new SubtypePredicate(SubType.AUROCHS)); + filter1.add(SubType.AUROCHS.getPredicate()); filter1.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/a/AurochsHerd.java b/Mage.Sets/src/mage/cards/a/AurochsHerd.java index 3434b0ab19..490ca31cbd 100644 --- a/Mage.Sets/src/mage/cards/a/AurochsHerd.java +++ b/Mage.Sets/src/mage/cards/a/AurochsHerd.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetCardInLibrary; @@ -31,8 +30,8 @@ public final class AurochsHerd extends CardImpl { private static final FilterAttackingCreature filter2 = new FilterAttackingCreature("other attacking Aurochs"); static { - filter1.add(new SubtypePredicate(SubType.AUROCHS)); - filter2.add(new SubtypePredicate(SubType.AUROCHS)); + filter1.add(SubType.AUROCHS.getPredicate()); + filter2.add(SubType.AUROCHS.getPredicate()); filter2.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/a/AvacynianPriest.java b/Mage.Sets/src/mage/cards/a/AvacynianPriest.java index 9a495c5bc5..2ca4d40441 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynianPriest.java +++ b/Mage.Sets/src/mage/cards/a/AvacynianPriest.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -26,7 +25,7 @@ public final class AvacynianPriest extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Human creature"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.HUMAN))); + filter.add(Predicates.not(SubType.HUMAN.getPredicate())); } public AvacynianPriest(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AvenBrigadier.java b/Mage.Sets/src/mage/cards/a/AvenBrigadier.java index 383ee8584c..367ba31878 100644 --- a/Mage.Sets/src/mage/cards/a/AvenBrigadier.java +++ b/Mage.Sets/src/mage/cards/a/AvenBrigadier.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -25,8 +24,8 @@ public final class AvenBrigadier extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("Soldier creatures"); static { - filter1.add(new SubtypePredicate(SubType.BIRD)); - filter2.add(new SubtypePredicate(SubType.SOLDIER)); + filter1.add(SubType.BIRD.getPredicate()); + filter2.add(SubType.SOLDIER.getPredicate()); } public AvenBrigadier(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AvengerOfZendikar.java b/Mage.Sets/src/mage/cards/a/AvengerOfZendikar.java index 92af33e97f..7edb12637c 100644 --- a/Mage.Sets/src/mage/cards/a/AvengerOfZendikar.java +++ b/Mage.Sets/src/mage/cards/a/AvengerOfZendikar.java @@ -17,7 +17,6 @@ import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.PlantToken; /** @@ -30,7 +29,7 @@ public final class AvengerOfZendikar extends CardImpl { private static final FilterControlledPermanent filterLand = new FilterControlledLandPermanent(); static { - filter.add(new SubtypePredicate(SubType.PLANT)); + filter.add(SubType.PLANT.getPredicate()); } public AvengerOfZendikar (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AvidReclaimer.java b/Mage.Sets/src/mage/cards/a/AvidReclaimer.java index 2839ebfefb..7eae5558a1 100644 --- a/Mage.Sets/src/mage/cards/a/AvidReclaimer.java +++ b/Mage.Sets/src/mage/cards/a/AvidReclaimer.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class AvidReclaimer extends CardImpl { static { filter.add(CardType.PLANESWALKER.getPredicate()); - filter.add(new SubtypePredicate(SubType.NISSA)); + filter.add(SubType.NISSA.getPredicate()); } public AvidReclaimer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AvoidFate.java b/Mage.Sets/src/mage/cards/a/AvoidFate.java index 19408aad75..eecd766c06 100644 --- a/Mage.Sets/src/mage/cards/a/AvoidFate.java +++ b/Mage.Sets/src/mage/cards/a/AvoidFate.java @@ -9,7 +9,6 @@ import mage.constants.SubType; import mage.filter.FilterSpell; import mage.filter.StaticFilters; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.other.TargetsPermanentPredicate; import mage.target.TargetSpell; @@ -24,7 +23,7 @@ public final class AvoidFate extends CardImpl { private static final FilterSpell filter = new FilterSpell("instant or Aura spell that targets a permanent you control"); static { - filter.add(Predicates.or(CardType.INSTANT.getPredicate(), new SubtypePredicate(SubType.AURA))); + filter.add(Predicates.or(CardType.INSTANT.getPredicate(), SubType.AURA.getPredicate())); filter.add(new TargetsPermanentPredicate(StaticFilters.FILTER_CONTROLLED_PERMANENT)); } diff --git a/Mage.Sets/src/mage/cards/a/AwokenHorror.java b/Mage.Sets/src/mage/cards/a/AwokenHorror.java index 40de5f4dc8..4e82d57a74 100644 --- a/Mage.Sets/src/mage/cards/a/AwokenHorror.java +++ b/Mage.Sets/src/mage/cards/a/AwokenHorror.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -52,7 +51,7 @@ class AwokenHorrorAbility extends TriggeredAbilityImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Horror creatures"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.HORROR))); + filter.add(Predicates.not(SubType.HORROR.getPredicate())); } public AwokenHorrorAbility() { diff --git a/Mage.Sets/src/mage/cards/a/AysenCrusader.java b/Mage.Sets/src/mage/cards/a/AysenCrusader.java index cb85fcc3cd..1fb31ebecf 100644 --- a/Mage.Sets/src/mage/cards/a/AysenCrusader.java +++ b/Mage.Sets/src/mage/cards/a/AysenCrusader.java @@ -17,7 +17,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -30,8 +29,8 @@ public final class AysenCrusader extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.SOLDIER), - new SubtypePredicate(SubType.WARRIOR) + SubType.SOLDIER.getPredicate(), + SubType.WARRIOR.getPredicate() )); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/a/AyulaQueenAmongBears.java b/Mage.Sets/src/mage/cards/a/AyulaQueenAmongBears.java index c12bb6c369..3d209a7f03 100644 --- a/Mage.Sets/src/mage/cards/a/AyulaQueenAmongBears.java +++ b/Mage.Sets/src/mage/cards/a/AyulaQueenAmongBears.java @@ -16,7 +16,6 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; @@ -36,7 +35,7 @@ public final class AyulaQueenAmongBears extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter3.add(new SubtypePredicate(SubType.BEAR)); + filter3.add(SubType.BEAR.getPredicate()); filter4.add(new ControllerPredicate(TargetController.NOT_YOU)); } diff --git a/Mage.Sets/src/mage/cards/a/AzamiLadyOfScrolls.java b/Mage.Sets/src/mage/cards/a/AzamiLadyOfScrolls.java index 0c3d861582..8c5e141e01 100644 --- a/Mage.Sets/src/mage/cards/a/AzamiLadyOfScrolls.java +++ b/Mage.Sets/src/mage/cards/a/AzamiLadyOfScrolls.java @@ -15,7 +15,6 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -28,7 +27,7 @@ public final class AzamiLadyOfScrolls extends CardImpl { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new SubtypePredicate(SubType.WIZARD)); + filter.add(SubType.WIZARD.getPredicate()); } public AzamiLadyOfScrolls(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BalaGedThief.java b/Mage.Sets/src/mage/cards/b/BalaGedThief.java index 1ab4059d2c..ddb5924cb5 100644 --- a/Mage.Sets/src/mage/cards/b/BalaGedThief.java +++ b/Mage.Sets/src/mage/cards/b/BalaGedThief.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; @@ -76,7 +75,7 @@ class BalaGedThiefEffect extends OneShotEffect { Player you = game.getPlayer(source.getControllerId()); FilterControlledPermanent filter = new FilterControlledPermanent(); - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); int numberOfAllies = game.getBattlefield().countAll(filter, you.getId(), game); diff --git a/Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java b/Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java index 98a1d0978e..159e4f5c18 100644 --- a/Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java +++ b/Mage.Sets/src/mage/cards/b/BalanWanderingKnight.java @@ -21,7 +21,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -81,7 +80,7 @@ public final class BalanWanderingKnight extends CardImpl { Permanent balan = game.getPermanent(source.getSourceId()); if (balan != null) { FilterPermanent filter = new FilterPermanent(); - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); for (Permanent equipment : game.getBattlefield().getAllActivePermanents(filter, source.getControllerId(),game)) { if (equipment != null) { //If an Equipment can't equip, it isn't attached, and it doesn't become unattached (if it's attached to a creature). diff --git a/Mage.Sets/src/mage/cards/b/BalduvianTradingPost.java b/Mage.Sets/src/mage/cards/b/BalduvianTradingPost.java index d133e2483a..a1cb0d18d5 100644 --- a/Mage.Sets/src/mage/cards/b/BalduvianTradingPost.java +++ b/Mage.Sets/src/mage/cards/b/BalduvianTradingPost.java @@ -19,7 +19,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetAttackingCreature; import mage.target.common.TargetControlledPermanent; @@ -33,7 +32,7 @@ public final class BalduvianTradingPost extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("an untapped Mountain"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/b/BalefulStare.java b/Mage.Sets/src/mage/cards/b/BalefulStare.java index 6c73727eea..cccfe6ab8d 100644 --- a/Mage.Sets/src/mage/cards/b/BalefulStare.java +++ b/Mage.Sets/src/mage/cards/b/BalefulStare.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; @@ -51,7 +50,7 @@ class BalefulStareEffect extends OneShotEffect { private static final FilterCard filter = new FilterCard("Mountain or red card"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.MOUNTAIN), + filter.add(Predicates.or(SubType.MOUNTAIN.getPredicate(), new ColorPredicate(ObjectColor.RED))); } diff --git a/Mage.Sets/src/mage/cards/b/BallyrushBanneret.java b/Mage.Sets/src/mage/cards/b/BallyrushBanneret.java index bd833cfdf6..d1fd6e1bbe 100644 --- a/Mage.Sets/src/mage/cards/b/BallyrushBanneret.java +++ b/Mage.Sets/src/mage/cards/b/BallyrushBanneret.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,8 +23,8 @@ public final class BallyrushBanneret extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.KITHKIN), - new SubtypePredicate(SubType.SOLDIER))); + SubType.KITHKIN.getPredicate(), + SubType.SOLDIER.getPredicate())); } public BallyrushBanneret(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BalthorTheStout.java b/Mage.Sets/src/mage/cards/b/BalthorTheStout.java index 1e280dd027..d36c067b13 100644 --- a/Mage.Sets/src/mage/cards/b/BalthorTheStout.java +++ b/Mage.Sets/src/mage/cards/b/BalthorTheStout.java @@ -13,7 +13,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; @@ -27,9 +26,9 @@ public final class BalthorTheStout extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("another target Barbarian"); static { - filter1.add(new SubtypePredicate(SubType.BARBARIAN)); + filter1.add(SubType.BARBARIAN.getPredicate()); filter2.add(AnotherPredicate.instance); - filter2.add(new SubtypePredicate(SubType.BARBARIAN)); + filter2.add(SubType.BARBARIAN.getPredicate()); } public BalthorTheStout(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BaneslayerAngel.java b/Mage.Sets/src/mage/cards/b/BaneslayerAngel.java index e53dac492b..6879525ba0 100644 --- a/Mage.Sets/src/mage/cards/b/BaneslayerAngel.java +++ b/Mage.Sets/src/mage/cards/b/BaneslayerAngel.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class BaneslayerAngel extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("Demons and from Dragons"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.DEMON), new SubtypePredicate(SubType.DRAGON))); + filter.add(Predicates.or(SubType.DEMON.getPredicate(), SubType.DRAGON.getPredicate())); } public BaneslayerAngel(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BantPanorama.java b/Mage.Sets/src/mage/cards/b/BantPanorama.java index de6f85c665..49246b0c1f 100644 --- a/Mage.Sets/src/mage/cards/b/BantPanorama.java +++ b/Mage.Sets/src/mage/cards/b/BantPanorama.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; @@ -29,9 +28,9 @@ public final class BantPanorama extends CardImpl { filter.add(CardType.LAND.getPredicate()); filter.add(new SupertypePredicate(SuperType.BASIC)); filter.add(Predicates.or( - new SubtypePredicate(SubType.FOREST), - new SubtypePredicate(SubType.PLAINS), - new SubtypePredicate(SubType.ISLAND))); + SubType.FOREST.getPredicate(), + SubType.PLAINS.getPredicate(), + SubType.ISLAND.getPredicate())); } public BantPanorama(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BarbarianOutcast.java b/Mage.Sets/src/mage/cards/b/BarbarianOutcast.java index a782198cc4..319faa28e5 100644 --- a/Mage.Sets/src/mage/cards/b/BarbarianOutcast.java +++ b/Mage.Sets/src/mage/cards/b/BarbarianOutcast.java @@ -12,7 +12,6 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -23,7 +22,7 @@ public final class BarbarianOutcast extends CardImpl { private static final FilterControlledLandPermanent filterControlledLand = new FilterControlledLandPermanent("a Swamp"); static { - filterControlledLand.add(new SubtypePredicate(SubType.SWAMP)); + filterControlledLand.add(SubType.SWAMP.getPredicate()); } public BarbarianOutcast(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BargeIn.java b/Mage.Sets/src/mage/cards/b/BargeIn.java index 6f3e297b92..86b152512e 100644 --- a/Mage.Sets/src/mage/cards/b/BargeIn.java +++ b/Mage.Sets/src/mage/cards/b/BargeIn.java @@ -11,7 +11,6 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AttackingPredicate; import mage.target.common.TargetAttackingCreature; @@ -27,7 +26,7 @@ public final class BargeIn extends CardImpl { static { filter.add(AttackingPredicate.instance); - filter.add(Predicates.not(new SubtypePredicate(SubType.HUMAN))); + filter.add(Predicates.not(SubType.HUMAN.getPredicate())); } public BargeIn(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BaronSengir.java b/Mage.Sets/src/mage/cards/b/BaronSengir.java index f97a75dbd9..999849cf49 100644 --- a/Mage.Sets/src/mage/cards/b/BaronSengir.java +++ b/Mage.Sets/src/mage/cards/b/BaronSengir.java @@ -16,7 +16,6 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; @@ -30,7 +29,7 @@ public final class BaronSengir extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target Vampire"); static { - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/b/BarrowWitches.java b/Mage.Sets/src/mage/cards/b/BarrowWitches.java index f442b28e5c..053af74305 100644 --- a/Mage.Sets/src/mage/cards/b/BarrowWitches.java +++ b/Mage.Sets/src/mage/cards/b/BarrowWitches.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInYourGraveyard; import java.util.UUID; @@ -22,7 +21,7 @@ public final class BarrowWitches extends CardImpl { private static final FilterCard filter = new FilterCard("Knight card from your graveyard"); static { - filter.add(new SubtypePredicate(SubType.KNIGHT)); + filter.add(SubType.KNIGHT.getPredicate()); } public BarrowWitches(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java b/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java index 7cd9d78dcb..113aa308d9 100644 --- a/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java +++ b/Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java @@ -19,11 +19,9 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.token.BaruFistOfKrosaToken; -import mage.game.permanent.token.TokenImpl; import mage.game.permanent.token.Token; /** @@ -36,7 +34,7 @@ public final class BaruFistOfKrosa extends CardImpl { private static final FilterCreaturePermanent greenCreatureFilter = new FilterCreaturePermanent("green creatures you control"); static { - forestFilter.add(new SubtypePredicate(SubType.FOREST)); + forestFilter.add(SubType.FOREST.getPredicate()); greenCreatureFilter.add(new ControllerPredicate(TargetController.YOU)); greenCreatureFilter.add(new ColorPredicate(ObjectColor.GREEN)); } diff --git a/Mage.Sets/src/mage/cards/b/BasalSliver.java b/Mage.Sets/src/mage/cards/b/BasalSliver.java index f7564ba471..3b39705019 100644 --- a/Mage.Sets/src/mage/cards/b/BasalSliver.java +++ b/Mage.Sets/src/mage/cards/b/BasalSliver.java @@ -16,7 +16,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -27,7 +26,7 @@ public final class BasalSliver extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("All Slivers"); static { - filter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); } public BasalSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BatteringRam.java b/Mage.Sets/src/mage/cards/b/BatteringRam.java index 398cd60947..3598fccadf 100644 --- a/Mage.Sets/src/mage/cards/b/BatteringRam.java +++ b/Mage.Sets/src/mage/cards/b/BatteringRam.java @@ -3,7 +3,6 @@ package mage.cards.b; import java.util.UUID; import mage.MageInt; -import mage.abilities.Ability; import mage.abilities.common.BecomesBlockedByCreatureTriggeredAbility; import mage.abilities.common.BeginningOfCombatTriggeredAbility; import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility; @@ -19,7 +18,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -30,7 +28,7 @@ public final class BatteringRam extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Wall"); static { - filter.add(new SubtypePredicate(SubType.WALL)); + filter.add(SubType.WALL.getPredicate()); } public BatteringRam(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BatteringSliver.java b/Mage.Sets/src/mage/cards/b/BatteringSliver.java index 6c3efbaf21..342515adb5 100644 --- a/Mage.Sets/src/mage/cards/b/BatteringSliver.java +++ b/Mage.Sets/src/mage/cards/b/BatteringSliver.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class BatteringSliver extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("all Sliver creatures"); static { - filter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); } public BatteringSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BattlefieldMedic.java b/Mage.Sets/src/mage/cards/b/BattlefieldMedic.java index 5e4f3ae7ad..7e78738078 100644 --- a/Mage.Sets/src/mage/cards/b/BattlefieldMedic.java +++ b/Mage.Sets/src/mage/cards/b/BattlefieldMedic.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -26,7 +25,7 @@ public final class BattlefieldMedic extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new SubtypePredicate(SubType.CLERIC)); + filter.add(SubType.CLERIC.getPredicate()); } public BattlefieldMedic(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BattlegroundGeist.java b/Mage.Sets/src/mage/cards/b/BattlegroundGeist.java index 232c1de12c..919046b0e9 100644 --- a/Mage.Sets/src/mage/cards/b/BattlegroundGeist.java +++ b/Mage.Sets/src/mage/cards/b/BattlegroundGeist.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @author nantuko @@ -23,7 +22,7 @@ public final class BattlegroundGeist extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Spirit creatures"); static { - filter.add(new SubtypePredicate(SubType.SPIRIT)); + filter.add(SubType.SPIRIT.getPredicate()); } public BattlegroundGeist(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BattlewandOak.java b/Mage.Sets/src/mage/cards/b/BattlewandOak.java index 12cc6cc947..7ae0b69293 100644 --- a/Mage.Sets/src/mage/cards/b/BattlewandOak.java +++ b/Mage.Sets/src/mage/cards/b/BattlewandOak.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,8 +23,8 @@ public final class BattlewandOak extends CardImpl { private static final FilterPermanent filterForest = new FilterPermanent("a Forest"); private static final FilterSpell filterTreefolk = new FilterSpell("a Treefolk spell"); static { - filterForest.add(new SubtypePredicate(SubType.FOREST)); - filterTreefolk.add(new SubtypePredicate(SubType.TREEFOLK)); + filterForest.add(SubType.FOREST.getPredicate()); + filterTreefolk.add(SubType.TREEFOLK.getPredicate()); } public BattlewandOak(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BeaconOfCreation.java b/Mage.Sets/src/mage/cards/b/BeaconOfCreation.java index 20e6ba921a..4dc8598724 100644 --- a/Mage.Sets/src/mage/cards/b/BeaconOfCreation.java +++ b/Mage.Sets/src/mage/cards/b/BeaconOfCreation.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.InsectToken; /** @@ -22,7 +21,7 @@ public final class BeaconOfCreation extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Forest you control"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public BeaconOfCreation(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BelligerentSliver.java b/Mage.Sets/src/mage/cards/b/BelligerentSliver.java index a357e611c2..3eb9e52145 100644 --- a/Mage.Sets/src/mage/cards/b/BelligerentSliver.java +++ b/Mage.Sets/src/mage/cards/b/BelligerentSliver.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -24,7 +23,7 @@ public final class BelligerentSliver extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); } public BelligerentSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BelltollDragon.java b/Mage.Sets/src/mage/cards/b/BelltollDragon.java index 1a0407c5ce..0d4bbc61db 100644 --- a/Mage.Sets/src/mage/cards/b/BelltollDragon.java +++ b/Mage.Sets/src/mage/cards/b/BelltollDragon.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -28,7 +27,7 @@ public final class BelltollDragon extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } public BelltollDragon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BenBenAkkiHermit.java b/Mage.Sets/src/mage/cards/b/BenBenAkkiHermit.java index a32d8b03f0..0d1095f446 100644 --- a/Mage.Sets/src/mage/cards/b/BenBenAkkiHermit.java +++ b/Mage.Sets/src/mage/cards/b/BenBenAkkiHermit.java @@ -16,7 +16,6 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetAttackingCreature; @@ -31,7 +30,7 @@ public final class BenBenAkkiHermit extends CardImpl { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public BenBenAkkiHermit(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BenalishCommander.java b/Mage.Sets/src/mage/cards/b/BenalishCommander.java index c7bdc7e810..b5d521a8b7 100644 --- a/Mage.Sets/src/mage/cards/b/BenalishCommander.java +++ b/Mage.Sets/src/mage/cards/b/BenalishCommander.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -33,7 +32,7 @@ public final class BenalishCommander extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Soldiers you control"); static { - filter.add(new SubtypePredicate(SubType.SOLDIER)); + filter.add(SubType.SOLDIER.getPredicate()); } public BenalishCommander(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/Benthicore.java b/Mage.Sets/src/mage/cards/b/Benthicore.java index 48424e9d86..77598e375d 100644 --- a/Mage.Sets/src/mage/cards/b/Benthicore.java +++ b/Mage.Sets/src/mage/cards/b/Benthicore.java @@ -19,7 +19,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.permanent.token.MerfolkWizardToken; import mage.target.common.TargetControlledPermanent; @@ -34,7 +33,7 @@ public final class Benthicore extends CardImpl { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new SubtypePredicate(SubType.MERFOLK)); + filter.add(SubType.MERFOLK.getPredicate()); } public Benthicore(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BerserkMurlodont.java b/Mage.Sets/src/mage/cards/b/BerserkMurlodont.java index 92abfefdf1..cf90207ce3 100644 --- a/Mage.Sets/src/mage/cards/b/BerserkMurlodont.java +++ b/Mage.Sets/src/mage/cards/b/BerserkMurlodont.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class BerserkMurlodont extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a Beast"); static { - filter.add(new SubtypePredicate(SubType.BEAST)); + filter.add(SubType.BEAST.getPredicate()); } public BerserkMurlodont(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BindingMummy.java b/Mage.Sets/src/mage/cards/b/BindingMummy.java index 69217bf9a9..2b5df4cc62 100644 --- a/Mage.Sets/src/mage/cards/b/BindingMummy.java +++ b/Mage.Sets/src/mage/cards/b/BindingMummy.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.Zone; import static mage.filter.StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.TargetPermanent; @@ -27,7 +26,7 @@ public final class BindingMummy extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public BindingMummy(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BiogenicOoze.java b/Mage.Sets/src/mage/cards/b/BiogenicOoze.java index 7f6d1b87f4..b8964f26de 100644 --- a/Mage.Sets/src/mage/cards/b/BiogenicOoze.java +++ b/Mage.Sets/src/mage/cards/b/BiogenicOoze.java @@ -15,7 +15,6 @@ import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.BiogenicOozeToken; import java.util.UUID; @@ -28,7 +27,7 @@ public final class BiogenicOoze extends CardImpl { private static final FilterPermanent filter = new FilterControlledPermanent("Ooze you control"); static { - filter.add(new SubtypePredicate(SubType.OOZE)); + filter.add(SubType.OOZE.getPredicate()); } public BiogenicOoze(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BirchloreRangers.java b/Mage.Sets/src/mage/cards/b/BirchloreRangers.java index 749f216e29..812fdb387b 100644 --- a/Mage.Sets/src/mage/cards/b/BirchloreRangers.java +++ b/Mage.Sets/src/mage/cards/b/BirchloreRangers.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -27,7 +26,7 @@ public final class BirchloreRangers extends CardImpl { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public BirchloreRangers(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BishopOfTheBloodstained.java b/Mage.Sets/src/mage/cards/b/BishopOfTheBloodstained.java index 7ab0cf1aa2..df91dd2294 100644 --- a/Mage.Sets/src/mage/cards/b/BishopOfTheBloodstained.java +++ b/Mage.Sets/src/mage/cards/b/BishopOfTheBloodstained.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetOpponent; @@ -26,7 +25,7 @@ public final class BishopOfTheBloodstained extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Vampire you control"); static { - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/b/BitterheartWitch.java b/Mage.Sets/src/mage/cards/b/BitterheartWitch.java index c010a92f29..4527fc3c3a 100644 --- a/Mage.Sets/src/mage/cards/b/BitterheartWitch.java +++ b/Mage.Sets/src/mage/cards/b/BitterheartWitch.java @@ -15,7 +15,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; @@ -58,7 +57,7 @@ class BitterheartWitchEffect extends OneShotEffect { private static final FilterCard filter = new FilterCard("Curse card in your library"); static { - filter.add(new SubtypePredicate(SubType.CURSE)); + filter.add(SubType.CURSE.getPredicate()); } public BitterheartWitchEffect() { diff --git a/Mage.Sets/src/mage/cards/b/BlackMarketDealer.java b/Mage.Sets/src/mage/cards/b/BlackMarketDealer.java index 6748be2f84..1e79453e70 100644 --- a/Mage.Sets/src/mage/cards/b/BlackMarketDealer.java +++ b/Mage.Sets/src/mage/cards/b/BlackMarketDealer.java @@ -17,7 +17,6 @@ import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPlayer; import mage.target.common.TargetOpponentsCreaturePermanent; @@ -34,7 +33,7 @@ public final class BlackMarketDealer extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(Predicates.or(new SubtypePredicate(SubType.ROGUE), new SubtypePredicate(SubType.HUNTER))); + filter.add(Predicates.or(SubType.ROGUE.getPredicate(), SubType.HUNTER.getPredicate())); } public BlackMarketDealer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BlackPoplarShaman.java b/Mage.Sets/src/mage/cards/b/BlackPoplarShaman.java index 09b6f7fe6b..c58738b3f0 100644 --- a/Mage.Sets/src/mage/cards/b/BlackPoplarShaman.java +++ b/Mage.Sets/src/mage/cards/b/BlackPoplarShaman.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import java.util.UUID; @@ -26,7 +25,7 @@ public final class BlackPoplarShaman extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Treefolk"); static { - filter.add(new SubtypePredicate(SubType.TREEFOLK)); + filter.add(SubType.TREEFOLK.getPredicate()); } public BlackPoplarShaman(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BladeSplicer.java b/Mage.Sets/src/mage/cards/b/BladeSplicer.java index 0e64d95264..f905106a96 100644 --- a/Mage.Sets/src/mage/cards/b/BladeSplicer.java +++ b/Mage.Sets/src/mage/cards/b/BladeSplicer.java @@ -16,7 +16,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.GolemToken; /** @@ -28,7 +27,7 @@ public final class BladeSplicer extends CardImpl { static { filter.add(CardType.CREATURE.getPredicate()); - filter.add(new SubtypePredicate(SubType.GOLEM)); + filter.add(SubType.GOLEM.getPredicate()); } public BladeSplicer (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BladewingTheRisen.java b/Mage.Sets/src/mage/cards/b/BladewingTheRisen.java index 63b95f0ec0..da5eefc2c1 100644 --- a/Mage.Sets/src/mage/cards/b/BladewingTheRisen.java +++ b/Mage.Sets/src/mage/cards/b/BladewingTheRisen.java @@ -15,7 +15,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.Target; import mage.target.common.TargetCardInYourGraveyard; @@ -28,8 +27,8 @@ public final class BladewingTheRisen extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Dragon creatures"); private static final FilterPermanentCard filterCard = new FilterPermanentCard("Dragon permanent card from your graveyard"); static { - filter.add(new SubtypePredicate(SubType.DRAGON)); - filterCard.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); + filterCard.add(SubType.DRAGON.getPredicate()); } public BladewingTheRisen(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BlanchwoodArmor.java b/Mage.Sets/src/mage/cards/b/BlanchwoodArmor.java index 920cebd027..4eac11c15f 100644 --- a/Mage.Sets/src/mage/cards/b/BlanchwoodArmor.java +++ b/Mage.Sets/src/mage/cards/b/BlanchwoodArmor.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -25,7 +24,7 @@ public final class BlanchwoodArmor extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Forest you control"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public BlanchwoodArmor(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BlasterMage.java b/Mage.Sets/src/mage/cards/b/BlasterMage.java index 94ddba2e28..351bf1194d 100644 --- a/Mage.Sets/src/mage/cards/b/BlasterMage.java +++ b/Mage.Sets/src/mage/cards/b/BlasterMage.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -27,7 +26,7 @@ public final class BlasterMage extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Wall"); static { - filter.add(new SubtypePredicate(SubType.WALL)); + filter.add(SubType.WALL.getPredicate()); } public BlasterMage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BlazingTorch.java b/Mage.Sets/src/mage/cards/b/BlazingTorch.java index eafa316d7f..02b8f3dae5 100644 --- a/Mage.Sets/src/mage/cards/b/BlazingTorch.java +++ b/Mage.Sets/src/mage/cards/b/BlazingTorch.java @@ -24,7 +24,6 @@ import java.util.UUID; import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesAttachedEffect; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -34,8 +33,8 @@ public final class BlazingTorch extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Vampires or Zombies"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.VAMPIRE), - new SubtypePredicate(SubType.ZOMBIE))); + filter.add(Predicates.or(SubType.VAMPIRE.getPredicate(), + SubType.ZOMBIE.getPredicate())); } public BlazingTorch(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BlightedShaman.java b/Mage.Sets/src/mage/cards/b/BlightedShaman.java index 8643f468a9..6edbefc349 100644 --- a/Mage.Sets/src/mage/cards/b/BlightedShaman.java +++ b/Mage.Sets/src/mage/cards/b/BlightedShaman.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -30,7 +29,7 @@ public final class BlightedShaman extends CardImpl { private static final FilterControlledPermanent filterSwamp = new FilterControlledPermanent("a Swamp"); static { - filterSwamp.add(new SubtypePredicate(SubType.SWAMP)); + filterSwamp.add(SubType.SWAMP.getPredicate()); } public BlightedShaman(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/Blightspeaker.java b/Mage.Sets/src/mage/cards/b/Blightspeaker.java index e088842a71..0dece9832c 100644 --- a/Mage.Sets/src/mage/cards/b/Blightspeaker.java +++ b/Mage.Sets/src/mage/cards/b/Blightspeaker.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPlayer; import mage.target.common.TargetCardInLibrary; @@ -30,7 +29,7 @@ public final class Blightspeaker extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with converted mana cost 3 or less"); static { - filter.add(new SubtypePredicate(SubType.REBEL)); + filter.add(SubType.REBEL.getPredicate()); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); } diff --git a/Mage.Sets/src/mage/cards/b/BlindSpotGiant.java b/Mage.Sets/src/mage/cards/b/BlindSpotGiant.java index bb9a88fe7f..017ada836c 100644 --- a/Mage.Sets/src/mage/cards/b/BlindSpotGiant.java +++ b/Mage.Sets/src/mage/cards/b/BlindSpotGiant.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -24,7 +23,7 @@ public final class BlindSpotGiant extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("you control another Giant"); static { - filter.add(new SubtypePredicate(SubType.GIANT)); + filter.add(SubType.GIANT.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/b/BlinkmothNexus.java b/Mage.Sets/src/mage/cards/b/BlinkmothNexus.java index 172b43b805..67b4cae1ed 100644 --- a/Mage.Sets/src/mage/cards/b/BlinkmothNexus.java +++ b/Mage.Sets/src/mage/cards/b/BlinkmothNexus.java @@ -19,7 +19,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.custom.CreatureToken; import mage.target.TargetPermanent; @@ -31,7 +30,7 @@ public final class BlinkmothNexus extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Blinkmoth"); static { - filter.add(new SubtypePredicate(SubType.BLINKMOTH)); + filter.add(SubType.BLINKMOTH.getPredicate()); } public BlinkmothNexus(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BloodChinFanatic.java b/Mage.Sets/src/mage/cards/b/BloodChinFanatic.java index a05a7f2857..6df0127ce0 100644 --- a/Mage.Sets/src/mage/cards/b/BloodChinFanatic.java +++ b/Mage.Sets/src/mage/cards/b/BloodChinFanatic.java @@ -17,7 +17,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; @@ -32,7 +31,7 @@ public final class BloodChinFanatic extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new SubtypePredicate(SubType.WARRIOR)); + filter.add(SubType.WARRIOR.getPredicate()); } public BloodChinFanatic(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BloodSpeaker.java b/Mage.Sets/src/mage/cards/b/BloodSpeaker.java index b299a15eb0..5cd68a296e 100644 --- a/Mage.Sets/src/mage/cards/b/BloodSpeaker.java +++ b/Mage.Sets/src/mage/cards/b/BloodSpeaker.java @@ -16,7 +16,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; import java.util.UUID; @@ -30,8 +29,8 @@ public final class BloodSpeaker extends CardImpl { private static final FilterCard filterCard = new FilterCard("Demon card"); static { - filter.add(new SubtypePredicate(SubType.DEMON)); - filterCard.add(new SubtypePredicate(SubType.DEMON)); + filter.add(SubType.DEMON.getPredicate()); + filterCard.add(SubType.DEMON.getPredicate()); } public BloodSpeaker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BloodlineKeeper.java b/Mage.Sets/src/mage/cards/b/BloodlineKeeper.java index b9fc172095..1cb1529302 100644 --- a/Mage.Sets/src/mage/cards/b/BloodlineKeeper.java +++ b/Mage.Sets/src/mage/cards/b/BloodlineKeeper.java @@ -21,7 +21,6 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.VampireToken; /** @@ -32,7 +31,7 @@ public final class BloodlineKeeper extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("you control five or more Vampires"); static { - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); } public BloodlineKeeper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BloodlineNecromancer.java b/Mage.Sets/src/mage/cards/b/BloodlineNecromancer.java index 9ab101f27c..eb5d3e0e66 100644 --- a/Mage.Sets/src/mage/cards/b/BloodlineNecromancer.java +++ b/Mage.Sets/src/mage/cards/b/BloodlineNecromancer.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.Target; import mage.target.common.TargetCardInYourGraveyard; @@ -27,7 +26,7 @@ public final class BloodlineNecromancer extends CardImpl { private static final FilterCreatureCard filter = new FilterCreatureCard("Vampire or Wizard creature card from your graveyard"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.VAMPIRE), new SubtypePredicate(SubType.WIZARD))); + filter.add(Predicates.or(SubType.VAMPIRE.getPredicate(), SubType.WIZARD.getPredicate())); } public BloodlineNecromancer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BloodlineShaman.java b/Mage.Sets/src/mage/cards/b/BloodlineShaman.java index 9cae143784..673fcfbc9b 100644 --- a/Mage.Sets/src/mage/cards/b/BloodlineShaman.java +++ b/Mage.Sets/src/mage/cards/b/BloodlineShaman.java @@ -16,7 +16,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; @@ -73,7 +72,7 @@ class BloodlineShamanEffect extends OneShotEffect { if (controller != null && sourceObject != null && controller.choose(outcome, typeChoice, game)) { game.informPlayers(sourceObject.getLogName() + " chosen type: " + typeChoice.getChoice()); FilterCard filterSubtype = new FilterCard(); - filterSubtype.add(new SubtypePredicate(SubType.byDescription(typeChoice.getChoice()))); + filterSubtype.add(SubType.byDescription(typeChoice.getChoice()).getPredicate()); // Reveal the top card of your library. if (controller.getLibrary().hasCards()) { diff --git a/Mage.Sets/src/mage/cards/b/BloodlordOfVaasgoth.java b/Mage.Sets/src/mage/cards/b/BloodlordOfVaasgoth.java index 5b53953570..47feb77319 100644 --- a/Mage.Sets/src/mage/cards/b/BloodlordOfVaasgoth.java +++ b/Mage.Sets/src/mage/cards/b/BloodlordOfVaasgoth.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.stack.Spell; @@ -27,7 +26,7 @@ public final class BloodlordOfVaasgoth extends CardImpl { static { filter.add(CardType.CREATURE.getPredicate()); - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); } public BloodlordOfVaasgoth(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BloodstokeHowler.java b/Mage.Sets/src/mage/cards/b/BloodstokeHowler.java index f3409305c2..1f0b04a2b5 100644 --- a/Mage.Sets/src/mage/cards/b/BloodstokeHowler.java +++ b/Mage.Sets/src/mage/cards/b/BloodstokeHowler.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class BloodstokeHowler extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Beast creatures you control"); static { - filter.add(new SubtypePredicate(SubType.BEAST)); + filter.add(SubType.BEAST.getPredicate()); } public BloodstokeHowler(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BloodthirstyOgre.java b/Mage.Sets/src/mage/cards/b/BloodthirstyOgre.java index 0b103d0a03..18ddcdfce4 100644 --- a/Mage.Sets/src/mage/cards/b/BloodthirstyOgre.java +++ b/Mage.Sets/src/mage/cards/b/BloodthirstyOgre.java @@ -21,7 +21,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -33,7 +32,7 @@ public final class BloodthirstyOgre extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("you control a Demon"); static { - filter.add(new SubtypePredicate(SubType.DEMON)); + filter.add(SubType.DEMON.getPredicate()); } public BloodthirstyOgre(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BludgeonBrawl.java b/Mage.Sets/src/mage/cards/b/BludgeonBrawl.java index c5ded3194b..5979a3dca0 100644 --- a/Mage.Sets/src/mage/cards/b/BludgeonBrawl.java +++ b/Mage.Sets/src/mage/cards/b/BludgeonBrawl.java @@ -17,7 +17,6 @@ import mage.cards.CardsImpl; import mage.constants.*; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -80,7 +79,7 @@ class BludgeonBrawlAddSubtypeEffect extends ContinuousEffectImpl { public boolean apply(Game game, Ability source) { FilterArtifactPermanent filter = new FilterArtifactPermanent("noncreature, non-Equipment artifact"); filter.add(Predicates.not(CardType.CREATURE.getPredicate())); - filter.add(Predicates.not(new SubtypePredicate(SubType.EQUIPMENT))); + filter.add(Predicates.not(SubType.EQUIPMENT.getPredicate())); Cards affectedPermanents = new CardsImpl(); List permanents = game.getBattlefield().getActivePermanents(filter, source.getControllerId(), game); diff --git a/Mage.Sets/src/mage/cards/b/BogGlider.java b/Mage.Sets/src/mage/cards/b/BogGlider.java index d00ee5c13b..4151ece862 100644 --- a/Mage.Sets/src/mage/cards/b/BogGlider.java +++ b/Mage.Sets/src/mage/cards/b/BogGlider.java @@ -19,7 +19,6 @@ import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledPermanent; @@ -33,7 +32,7 @@ public final class BogGlider extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with converted mana cost 2 or less"); static { - filter.add(new SubtypePredicate(SubType.MERCENARY)); + filter.add(SubType.MERCENARY.getPredicate()); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); } diff --git a/Mage.Sets/src/mage/cards/b/BogRats.java b/Mage.Sets/src/mage/cards/b/BogRats.java index b35e1b280f..1ee9eb6e75 100644 --- a/Mage.Sets/src/mage/cards/b/BogRats.java +++ b/Mage.Sets/src/mage/cards/b/BogRats.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class BogRats extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Walls"); static { - filter.add(new SubtypePredicate(SubType.WALL)); + filter.add(SubType.WALL.getPredicate()); } public BogRats(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BogStriderAsh.java b/Mage.Sets/src/mage/cards/b/BogStriderAsh.java index 8dda42a818..f83dc24800 100644 --- a/Mage.Sets/src/mage/cards/b/BogStriderAsh.java +++ b/Mage.Sets/src/mage/cards/b/BogStriderAsh.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class BogStriderAsh extends CardImpl { private static final FilterSpell filter = new FilterSpell("a Goblin spell"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public BogStriderAsh(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BoggartArsonists.java b/Mage.Sets/src/mage/cards/b/BoggartArsonists.java index a74838141b..7bd4e7c7f9 100644 --- a/Mage.Sets/src/mage/cards/b/BoggartArsonists.java +++ b/Mage.Sets/src/mage/cards/b/BoggartArsonists.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -29,8 +28,8 @@ public final class BoggartArsonists extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.SCARECROW), - new SubtypePredicate(SubType.PLAINS))); + SubType.SCARECROW.getPredicate(), + SubType.PLAINS.getPredicate())); } public BoggartArsonists(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BoggartBirthRite.java b/Mage.Sets/src/mage/cards/b/BoggartBirthRite.java index 0ec6e1eced..b7799bee8c 100644 --- a/Mage.Sets/src/mage/cards/b/BoggartBirthRite.java +++ b/Mage.Sets/src/mage/cards/b/BoggartBirthRite.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInYourGraveyard; /** @@ -20,7 +19,7 @@ public final class BoggartBirthRite extends CardImpl { private static final FilterCard filter = new FilterCard("Goblin card from your graveyard"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public BoggartBirthRite(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BoggartHarbinger.java b/Mage.Sets/src/mage/cards/b/BoggartHarbinger.java index 60f1e81926..89fd9f8806 100644 --- a/Mage.Sets/src/mage/cards/b/BoggartHarbinger.java +++ b/Mage.Sets/src/mage/cards/b/BoggartHarbinger.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -22,7 +21,7 @@ public final class BoggartHarbinger extends CardImpl { private static final FilterCard filter = new FilterCard("Goblin card"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public BoggartHarbinger(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BoggartLoggers.java b/Mage.Sets/src/mage/cards/b/BoggartLoggers.java index 6195174a9c..e99a10ee67 100644 --- a/Mage.Sets/src/mage/cards/b/BoggartLoggers.java +++ b/Mage.Sets/src/mage/cards/b/BoggartLoggers.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -29,8 +28,8 @@ public final class BoggartLoggers extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.TREEFOLK), - new SubtypePredicate(SubType.FOREST))); + SubType.TREEFOLK.getPredicate(), + SubType.FOREST.getPredicate())); } public BoggartLoggers(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BoggartMob.java b/Mage.Sets/src/mage/cards/b/BoggartMob.java index 8f6d7fe85e..d1d42e0c9a 100644 --- a/Mage.Sets/src/mage/cards/b/BoggartMob.java +++ b/Mage.Sets/src/mage/cards/b/BoggartMob.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SetTargetPointer; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.GoblinRogueToken; /** @@ -24,7 +23,7 @@ public final class BoggartMob extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Goblin you control"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public BoggartMob(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BoggartShenanigans.java b/Mage.Sets/src/mage/cards/b/BoggartShenanigans.java index ac4a4d5a06..6ac2eca4c7 100644 --- a/Mage.Sets/src/mage/cards/b/BoggartShenanigans.java +++ b/Mage.Sets/src/mage/cards/b/BoggartShenanigans.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetPlayerOrPlaneswalker; @@ -25,7 +24,7 @@ public final class BoggartShenanigans extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public BoggartShenanigans(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/Boil.java b/Mage.Sets/src/mage/cards/b/Boil.java index 51ab75a78a..c442e97aa1 100644 --- a/Mage.Sets/src/mage/cards/b/Boil.java +++ b/Mage.Sets/src/mage/cards/b/Boil.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -19,7 +18,7 @@ public final class Boil extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Islands"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } public Boil(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BoilingSeas.java b/Mage.Sets/src/mage/cards/b/BoilingSeas.java index 978252ecf2..726c28cc5a 100644 --- a/Mage.Sets/src/mage/cards/b/BoilingSeas.java +++ b/Mage.Sets/src/mage/cards/b/BoilingSeas.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -18,7 +17,7 @@ public final class BoilingSeas extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Islands"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } public BoilingSeas(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/Boneknitter.java b/Mage.Sets/src/mage/cards/b/Boneknitter.java index 76fe55577d..3d34cb4e70 100644 --- a/Mage.Sets/src/mage/cards/b/Boneknitter.java +++ b/Mage.Sets/src/mage/cards/b/Boneknitter.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -26,7 +25,7 @@ public final class Boneknitter extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Zombie"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public Boneknitter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BoneyardScourge.java b/Mage.Sets/src/mage/cards/b/BoneyardScourge.java index a604ccf7ae..0b2b112178 100644 --- a/Mage.Sets/src/mage/cards/b/BoneyardScourge.java +++ b/Mage.Sets/src/mage/cards/b/BoneyardScourge.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -33,7 +32,7 @@ public final class BoneyardScourge extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a Dragon you control"); static { - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/b/BoonweaverGiant.java b/Mage.Sets/src/mage/cards/b/BoonweaverGiant.java index d678837fa9..3a8f2c78c2 100644 --- a/Mage.Sets/src/mage/cards/b/BoonweaverGiant.java +++ b/Mage.Sets/src/mage/cards/b/BoonweaverGiant.java @@ -14,7 +14,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -76,7 +75,7 @@ class BoonweaverGiantEffect extends OneShotEffect { FilterCard filter = new FilterCard("Aura card"); filter.add(CardType.ENCHANTMENT.getPredicate()); - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); Card card = null; Zone zone = null; diff --git a/Mage.Sets/src/mage/cards/b/BorderlandBehemoth.java b/Mage.Sets/src/mage/cards/b/BorderlandBehemoth.java index be1ae9d69b..a07727449c 100644 --- a/Mage.Sets/src/mage/cards/b/BorderlandBehemoth.java +++ b/Mage.Sets/src/mage/cards/b/BorderlandBehemoth.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.PermanentIdPredicate; @@ -35,7 +34,7 @@ public final class BorderlandBehemoth extends CardImpl { // Borderland Behemoth gets +4/+4 for each other Giant you control. FilterCreaturePermanent filter = new FilterCreaturePermanent("other Giant you control"); - filter.add(new SubtypePredicate(SubType.GIANT)); + filter.add(SubType.GIANT.getPredicate()); filter.add(Predicates.not(new PermanentIdPredicate(this.getId()))); filter.add(new ControllerPredicate(TargetController.YOU)); DynamicValue xValue = new PermanentsOnBattlefieldCount(filter, 4); diff --git a/Mage.Sets/src/mage/cards/b/BoreasCharger.java b/Mage.Sets/src/mage/cards/b/BoreasCharger.java index 4050b02399..8781df46d0 100644 --- a/Mage.Sets/src/mage/cards/b/BoreasCharger.java +++ b/Mage.Sets/src/mage/cards/b/BoreasCharger.java @@ -20,7 +20,6 @@ import mage.filter.FilterPlayer; import mage.filter.StaticFilters; import mage.filter.predicate.ObjectSourcePlayer; import mage.filter.predicate.ObjectSourcePlayerPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; @@ -70,7 +69,7 @@ class BoreasChargerEffect extends OneShotEffect { static { filter.add(new BoreasChargerPredicate()); - filter2.add(new SubtypePredicate(SubType.PLAINS)); + filter2.add(SubType.PLAINS.getPredicate()); } public BoreasChargerEffect() { diff --git a/Mage.Sets/src/mage/cards/b/BoskBanneret.java b/Mage.Sets/src/mage/cards/b/BoskBanneret.java index d7138f96c4..02ce3e3835 100644 --- a/Mage.Sets/src/mage/cards/b/BoskBanneret.java +++ b/Mage.Sets/src/mage/cards/b/BoskBanneret.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,8 +23,8 @@ public final class BoskBanneret extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.TREEFOLK), - new SubtypePredicate(SubType.SHAMAN))); + SubType.TREEFOLK.getPredicate(), + SubType.SHAMAN.getPredicate())); } public BoskBanneret(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BrassSquire.java b/Mage.Sets/src/mage/cards/b/BrassSquire.java index 660a36e30a..e166501aa9 100644 --- a/Mage.Sets/src/mage/cards/b/BrassSquire.java +++ b/Mage.Sets/src/mage/cards/b/BrassSquire.java @@ -14,7 +14,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; @@ -29,7 +28,7 @@ public final class BrassSquire extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Equipment you control"); static { - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); } public BrassSquire(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BrassTalonChimera.java b/Mage.Sets/src/mage/cards/b/BrassTalonChimera.java index 6d80495ed5..38cdf298a6 100644 --- a/Mage.Sets/src/mage/cards/b/BrassTalonChimera.java +++ b/Mage.Sets/src/mage/cards/b/BrassTalonChimera.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -28,7 +27,7 @@ public final class BrassTalonChimera extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Chimera creature"); static { - filter.add(new SubtypePredicate(SubType.CHIMERA)); + filter.add(SubType.CHIMERA.getPredicate()); } public BrassTalonChimera(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/Brawn.java b/Mage.Sets/src/mage/cards/b/Brawn.java index fd9124748d..4580be09c5 100644 --- a/Mage.Sets/src/mage/cards/b/Brawn.java +++ b/Mage.Sets/src/mage/cards/b/Brawn.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -31,7 +30,7 @@ public final class Brawn extends CardImpl { static { filter.add(CardType.LAND.getPredicate()); - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public Brawn(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BrighthearthBanneret.java b/Mage.Sets/src/mage/cards/b/BrighthearthBanneret.java index d7d26d48f7..1d6c96aa68 100644 --- a/Mage.Sets/src/mage/cards/b/BrighthearthBanneret.java +++ b/Mage.Sets/src/mage/cards/b/BrighthearthBanneret.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,8 +25,8 @@ public final class BrighthearthBanneret extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.ELEMENTAL), - new SubtypePredicate(SubType.WARRIOR))); + SubType.ELEMENTAL.getPredicate(), + SubType.WARRIOR.getPredicate())); } public BrighthearthBanneret(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BrightstoneRitual.java b/Mage.Sets/src/mage/cards/b/BrightstoneRitual.java index 107aab194d..29f47775f7 100644 --- a/Mage.Sets/src/mage/cards/b/BrightstoneRitual.java +++ b/Mage.Sets/src/mage/cards/b/BrightstoneRitual.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -21,7 +20,7 @@ public final class BrightstoneRitual extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Goblin on the battlefield"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public BrightstoneRitual(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BroodBirthing.java b/Mage.Sets/src/mage/cards/b/BroodBirthing.java index f6d6f8c81c..f030bb2ae3 100644 --- a/Mage.Sets/src/mage/cards/b/BroodBirthing.java +++ b/Mage.Sets/src/mage/cards/b/BroodBirthing.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.token.EldraziSpawnToken; @@ -56,8 +55,8 @@ class BroodBirthingEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Eldrazi Spawn"); - filter.add(new SubtypePredicate(SubType.ELDRAZI)); - filter.add(new SubtypePredicate(SubType.SPAWN)); + filter.add(SubType.ELDRAZI.getPredicate()); + filter.add(SubType.SPAWN.getPredicate()); EldraziSpawnToken token = new EldraziSpawnToken(); int count = game.getBattlefield().countAll(filter, source.getControllerId(), game) > 0 ? 3 : 1; diff --git a/Mage.Sets/src/mage/cards/b/Broodwarden.java b/Mage.Sets/src/mage/cards/b/Broodwarden.java index 80b5055fad..a15ee5bbb8 100644 --- a/Mage.Sets/src/mage/cards/b/Broodwarden.java +++ b/Mage.Sets/src/mage/cards/b/Broodwarden.java @@ -12,7 +12,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -23,8 +22,8 @@ public final class Broodwarden extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Eldrazi Spawn creatures"); static { - filter.add(new SubtypePredicate(SubType.ELDRAZI)); - filter.add(new SubtypePredicate(SubType.SPAWN)); + filter.add(SubType.ELDRAZI.getPredicate()); + filter.add(SubType.SPAWN.getPredicate()); } public Broodwarden(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BrunaLightOfAlabaster.java b/Mage.Sets/src/mage/cards/b/BrunaLightOfAlabaster.java index 59e9d0f8fc..dcd09e1ec7 100644 --- a/Mage.Sets/src/mage/cards/b/BrunaLightOfAlabaster.java +++ b/Mage.Sets/src/mage/cards/b/BrunaLightOfAlabaster.java @@ -18,7 +18,6 @@ import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardIdPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.other.AuraCardCanAttachToPermanentId; import mage.filter.predicate.other.AuraPermanentCanAttachToPermanentId; import mage.game.Game; @@ -83,10 +82,10 @@ class BrunaLightOfAlabasterEffect extends OneShotEffect { FilterCard filterAuraCard = new FilterCard("Aura card"); filterAura.add(CardType.ENCHANTMENT.getPredicate()); - filterAura.add(new SubtypePredicate(SubType.AURA)); + filterAura.add(SubType.AURA.getPredicate()); filterAura.add(new AuraPermanentCanAttachToPermanentId(bruna)); filterAuraCard.add(CardType.ENCHANTMENT.getPredicate()); - filterAuraCard.add(new SubtypePredicate(SubType.AURA)); + filterAuraCard.add(SubType.AURA.getPredicate()); filterAuraCard.add(new AuraCardCanAttachToPermanentId(bruna)); if (controller == null) { diff --git a/Mage.Sets/src/mage/cards/b/BrunaTheFadingLight.java b/Mage.Sets/src/mage/cards/b/BrunaTheFadingLight.java index 81415d2ede..5ac27f6255 100644 --- a/Mage.Sets/src/mage/cards/b/BrunaTheFadingLight.java +++ b/Mage.Sets/src/mage/cards/b/BrunaTheFadingLight.java @@ -19,7 +19,6 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInYourGraveyard; /** @@ -32,8 +31,8 @@ public final class BrunaTheFadingLight extends CardImpl { static { filter.add(Predicates.and(CardType.CREATURE.getPredicate(), - (Predicates.or(new SubtypePredicate(SubType.HUMAN), - (new SubtypePredicate(SubType.ANGEL)))))); + (Predicates.or(SubType.HUMAN.getPredicate(), + (SubType.ANGEL.getPredicate()))))); } public BrunaTheFadingLight(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BrutalSuppression.java b/Mage.Sets/src/mage/cards/b/BrutalSuppression.java index 28b668cfad..cb9b1fd2fc 100644 --- a/Mage.Sets/src/mage/cards/b/BrutalSuppression.java +++ b/Mage.Sets/src/mage/cards/b/BrutalSuppression.java @@ -18,7 +18,6 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -56,7 +55,7 @@ class BrutalSuppressionAdditionalCostEffect extends CostModificationEffectImpl { private static final FilterPermanent filter2 = new FilterPermanent("nontoken Rebels"); static{ - filter2.add(new SubtypePredicate(SubType.REBEL)); + filter2.add(SubType.REBEL.getPredicate()); filter.add(Predicates.not(TokenPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/b/BubblingMuck.java b/Mage.Sets/src/mage/cards/b/BubblingMuck.java index 17d93899f2..86d0a4b820 100644 --- a/Mage.Sets/src/mage/cards/b/BubblingMuck.java +++ b/Mage.Sets/src/mage/cards/b/BubblingMuck.java @@ -14,7 +14,6 @@ import mage.constants.ColoredManaSymbol; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -49,7 +48,7 @@ class BubblingMuckTriggeredAbility extends DelayedTriggeredManaAbility { private static final FilterLandPermanent filter = new FilterLandPermanent("Swamp"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public BubblingMuckTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/b/BuccaneersBravado.java b/Mage.Sets/src/mage/cards/b/BuccaneersBravado.java index f20894e3e9..a264a752c7 100644 --- a/Mage.Sets/src/mage/cards/b/BuccaneersBravado.java +++ b/Mage.Sets/src/mage/cards/b/BuccaneersBravado.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -26,7 +25,7 @@ public final class BuccaneersBravado extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Pirate"); static { - filter.add(new SubtypePredicate(SubType.PIRATE)); + filter.add(SubType.PIRATE.getPredicate()); } public BuccaneersBravado(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BullAurochs.java b/Mage.Sets/src/mage/cards/b/BullAurochs.java index 9fe75590cc..c2dbf51d4a 100644 --- a/Mage.Sets/src/mage/cards/b/BullAurochs.java +++ b/Mage.Sets/src/mage/cards/b/BullAurochs.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -26,7 +25,7 @@ public final class BullAurochs extends CardImpl { private static final FilterAttackingCreature filter = new FilterAttackingCreature("other attacking Aurochs"); static { - filter.add(new SubtypePredicate(SubType.AUROCHS)); + filter.add(SubType.AUROCHS.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/b/BullElephant.java b/Mage.Sets/src/mage/cards/b/BullElephant.java index f294981590..2328b9e52f 100644 --- a/Mage.Sets/src/mage/cards/b/BullElephant.java +++ b/Mage.Sets/src/mage/cards/b/BullElephant.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import java.util.UUID; @@ -19,7 +18,7 @@ public final class BullElephant extends CardImpl { private static FilterControlledLandPermanent controlledForest = new FilterControlledLandPermanent("Forests"); static { - controlledForest.add(new SubtypePredicate(SubType.FOREST)); + controlledForest.add(SubType.FOREST.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/c/CabalArchon.java b/Mage.Sets/src/mage/cards/c/CabalArchon.java index b1ae0cb1f1..67d3b4379e 100644 --- a/Mage.Sets/src/mage/cards/c/CabalArchon.java +++ b/Mage.Sets/src/mage/cards/c/CabalArchon.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; @@ -29,7 +28,7 @@ public final class CabalArchon extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Cleric"); static { - filter.add(new SubtypePredicate(SubType.CLERIC)); + filter.add(SubType.CLERIC.getPredicate()); } public CabalArchon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CabalCoffers.java b/Mage.Sets/src/mage/cards/c/CabalCoffers.java index 15afb42b59..0bf971d065 100644 --- a/Mage.Sets/src/mage/cards/c/CabalCoffers.java +++ b/Mage.Sets/src/mage/cards/c/CabalCoffers.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -23,7 +22,7 @@ public final class CabalCoffers extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Swamp you control"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public CabalCoffers(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CabalSlaver.java b/Mage.Sets/src/mage/cards/c/CabalSlaver.java index 812200495c..8cb5a3be7a 100644 --- a/Mage.Sets/src/mage/cards/c/CabalSlaver.java +++ b/Mage.Sets/src/mage/cards/c/CabalSlaver.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SetTargetPointer; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class CabalSlaver extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("a Goblin"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public CabalSlaver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CabalStronghold.java b/Mage.Sets/src/mage/cards/c/CabalStronghold.java index 5909abf01e..a3ea0c289b 100644 --- a/Mage.Sets/src/mage/cards/c/CabalStronghold.java +++ b/Mage.Sets/src/mage/cards/c/CabalStronghold.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; /** @@ -29,7 +28,7 @@ public final class CabalStronghold extends CardImpl { static { filter.add(new SupertypePredicate(SuperType.BASIC)); - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public CabalStronghold(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CallToGlory.java b/Mage.Sets/src/mage/cards/c/CallToGlory.java index 1a3f3d6f5b..6a7cdcbcbe 100644 --- a/Mage.Sets/src/mage/cards/c/CallToGlory.java +++ b/Mage.Sets/src/mage/cards/c/CallToGlory.java @@ -11,7 +11,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @author Loki @@ -21,7 +20,7 @@ public final class CallToGlory extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Samurai"); static { - filter.add(new SubtypePredicate(SubType.SAMURAI)); + filter.add(SubType.SAMURAI.getPredicate()); } public CallToGlory(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CallToTheGrave.java b/Mage.Sets/src/mage/cards/c/CallToTheGrave.java index 5fa2e10f40..438d305dcc 100644 --- a/Mage.Sets/src/mage/cards/c/CallToTheGrave.java +++ b/Mage.Sets/src/mage/cards/c/CallToTheGrave.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.events.GameEvent; import java.util.UUID; @@ -31,7 +30,7 @@ public final class CallToTheGrave extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Zombie creature"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.ZOMBIE))); + filter.add(Predicates.not(SubType.ZOMBIE.getPredicate())); } public CallToTheGrave(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CallToTheKindred.java b/Mage.Sets/src/mage/cards/c/CallToTheKindred.java index 3b6bf2e502..09694cfa7b 100644 --- a/Mage.Sets/src/mage/cards/c/CallToTheKindred.java +++ b/Mage.Sets/src/mage/cards/c/CallToTheKindred.java @@ -16,7 +16,6 @@ import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -99,7 +98,7 @@ class CallToTheKindredEffect extends OneShotEffect { StringBuilder sb = new StringBuilder("creature card with at least one subtype from: "); List> subtypes = new ArrayList<>(); for (SubType subtype : creature.getSubtype(game)) { - subtypes.add(new SubtypePredicate(subtype)); + subtypes.add(subtype.getPredicate()); sb.append(subtype).append(", "); } filter.add(Predicates.or(subtypes)); diff --git a/Mage.Sets/src/mage/cards/c/CallerOfTheHunt.java b/Mage.Sets/src/mage/cards/c/CallerOfTheHunt.java index 02dacbe461..726bd9a379 100644 --- a/Mage.Sets/src/mage/cards/c/CallerOfTheHunt.java +++ b/Mage.Sets/src/mage/cards/c/CallerOfTheHunt.java @@ -20,7 +20,6 @@ import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.targetpointer.FixedTarget; /** @@ -66,7 +65,7 @@ enum CallerOfTheHuntAdjuster implements CostAdjuster { SubType typeChoice = (SubType) game.getState().getValue(mageObject.getId() + "_type"); if (typeChoice != null) { FilterCreaturePermanent filter = new FilterCreaturePermanent("chosen creature type"); - filter.add(new SubtypePredicate(typeChoice)); + filter.add(typeChoice.getPredicate()); ContinuousEffect effectPowerToughness = new SetPowerToughnessSourceEffect( new PermanentsOnBattlefieldCount(filter), Duration.EndOfGame); effectPowerToughness.setText(""); diff --git a/Mage.Sets/src/mage/cards/c/Camel.java b/Mage.Sets/src/mage/cards/c/Camel.java index bc8017d143..28c6b8b58c 100644 --- a/Mage.Sets/src/mage/cards/c/Camel.java +++ b/Mage.Sets/src/mage/cards/c/Camel.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.DamageCreatureEvent; @@ -55,7 +54,7 @@ class CamelEffect extends PreventionEffectImpl { private static final FilterPermanent filter = new FilterPermanent("Deserts"); static { - filter.add(new SubtypePredicate(SubType.DESERT)); + filter.add(SubType.DESERT.getPredicate()); } CamelEffect() { diff --git a/Mage.Sets/src/mage/cards/c/CaptainLanneryStorm.java b/Mage.Sets/src/mage/cards/c/CaptainLanneryStorm.java index 5fd7b9123e..91098d65ef 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainLanneryStorm.java +++ b/Mage.Sets/src/mage/cards/c/CaptainLanneryStorm.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.TreasureToken; @@ -29,7 +28,7 @@ public final class CaptainLanneryStorm extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("a Treasure"); static { - filter.add(new SubtypePredicate(SubType.TREASURE)); + filter.add(SubType.TREASURE.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java b/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java index b936bb82bf..ed939d9086 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java +++ b/Mage.Sets/src/mage/cards/c/CaptainOfTheMists.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.TargetPermanent; @@ -32,7 +31,7 @@ public final class CaptainOfTheMists extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new SubtypePredicate(SubType.HUMAN)); + filter.add(SubType.HUMAN.getPredicate()); } public CaptainOfTheMists(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CaptainOfTheWatch.java b/Mage.Sets/src/mage/cards/c/CaptainOfTheWatch.java index 16ebf0014e..0befed77cc 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainOfTheWatch.java +++ b/Mage.Sets/src/mage/cards/c/CaptainOfTheWatch.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SoldierToken; /** @@ -28,7 +27,7 @@ public final class CaptainOfTheWatch extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Soldier creatures"); static { - filter.add(new SubtypePredicate(SubType.SOLDIER)); + filter.add(SubType.SOLDIER.getPredicate()); } public CaptainOfTheWatch(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CaptainPhasma.java b/Mage.Sets/src/mage/cards/c/CaptainPhasma.java index d37a042cd1..fd725be893 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainPhasma.java +++ b/Mage.Sets/src/mage/cards/c/CaptainPhasma.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.TrooperToken; import mage.target.common.TargetCardInLibrary; @@ -31,9 +30,9 @@ public final class CaptainPhasma extends CardImpl { private static final FilterCreatureCard filterCard = new FilterCreatureCard("Trooper card"); static { - filter.add(new SubtypePredicate(SubType.TROOPER)); + filter.add(SubType.TROOPER.getPredicate()); filter.add(Predicates.not(TokenPredicate.instance)); - filterCard.add(new SubtypePredicate(SubType.TROOPER)); + filterCard.add(SubType.TROOPER.getPredicate()); } public CaptainPhasma(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CaptivatingVampire.java b/Mage.Sets/src/mage/cards/c/CaptivatingVampire.java index 7ae2146618..a5b8c7091b 100644 --- a/Mage.Sets/src/mage/cards/c/CaptivatingVampire.java +++ b/Mage.Sets/src/mage/cards/c/CaptivatingVampire.java @@ -15,7 +15,6 @@ import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -32,8 +31,8 @@ public final class CaptivatingVampire extends CardImpl { private static final FilterControlledCreaturePermanent filter2 = new FilterControlledCreaturePermanent("untapped Vampires you control"); static { - filter1.add(new SubtypePredicate(SubType.VAMPIRE)); - filter2.add(new SubtypePredicate(SubType.VAMPIRE)); + filter1.add(SubType.VAMPIRE.getPredicate()); + filter2.add(SubType.VAMPIRE.getPredicate()); filter2.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/c/CaribouRange.java b/Mage.Sets/src/mage/cards/c/CaribouRange.java index 4599b610ce..fd7a0f52ec 100644 --- a/Mage.Sets/src/mage/cards/c/CaribouRange.java +++ b/Mage.Sets/src/mage/cards/c/CaribouRange.java @@ -19,7 +19,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.CaribouToken; import mage.target.TargetPermanent; @@ -35,7 +34,7 @@ public final class CaribouRange extends CardImpl { static { filter.add(TokenPredicate.instance); - filter.add(new SubtypePredicate(SubType.CARIBOU)); + filter.add(SubType.CARIBOU.getPredicate()); } public CaribouRange(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CarpetOfFlowers.java b/Mage.Sets/src/mage/cards/c/CarpetOfFlowers.java index 08544531f0..400ed30f6e 100644 --- a/Mage.Sets/src/mage/cards/c/CarpetOfFlowers.java +++ b/Mage.Sets/src/mage/cards/c/CarpetOfFlowers.java @@ -12,7 +12,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -115,7 +114,7 @@ class CarpetOfFlowersEffect extends ManaEffect { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Island "); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); filter.add(CardType.LAND.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/c/CatacombDragon.java b/Mage.Sets/src/mage/cards/c/CatacombDragon.java index df2ca191d1..b9f7928b42 100644 --- a/Mage.Sets/src/mage/cards/c/CatacombDragon.java +++ b/Mage.Sets/src/mage/cards/c/CatacombDragon.java @@ -13,7 +13,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -29,7 +28,7 @@ public final class CatacombDragon extends CardImpl { static { filter.add(Predicates.not(CardType.ARTIFACT.getPredicate())); - filter.add(Predicates.not(new SubtypePredicate(SubType.DRAGON))); + filter.add(Predicates.not(SubType.DRAGON.getPredicate())); } public CatacombDragon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CatapultMaster.java b/Mage.Sets/src/mage/cards/c/CatapultMaster.java index ea9a17d070..9ee85210ae 100644 --- a/Mage.Sets/src/mage/cards/c/CatapultMaster.java +++ b/Mage.Sets/src/mage/cards/c/CatapultMaster.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -29,7 +28,7 @@ public final class CatapultMaster extends CardImpl { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new SubtypePredicate(SubType.SOLDIER)); + filter.add(SubType.SOLDIER.getPredicate()); } public CatapultMaster(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}"); diff --git a/Mage.Sets/src/mage/cards/c/CatapultSquad.java b/Mage.Sets/src/mage/cards/c/CatapultSquad.java index b8b9bd3af7..b80e1ce7ae 100644 --- a/Mage.Sets/src/mage/cards/c/CatapultSquad.java +++ b/Mage.Sets/src/mage/cards/c/CatapultSquad.java @@ -15,7 +15,6 @@ import mage.constants.Zone; import mage.filter.common.FilterAttackingOrBlockingCreature; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -30,7 +29,7 @@ public final class CatapultSquad extends CardImpl { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new SubtypePredicate(SubType.SOLDIER)); + filter.add(SubType.SOLDIER.getPredicate()); } public CatapultSquad(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CateranBrute.java b/Mage.Sets/src/mage/cards/c/CateranBrute.java index 5a985b1bf8..10007fe352 100644 --- a/Mage.Sets/src/mage/cards/c/CateranBrute.java +++ b/Mage.Sets/src/mage/cards/c/CateranBrute.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -29,7 +28,7 @@ public final class CateranBrute extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with converted mana cost 2 or less"); static { - filter.add(new SubtypePredicate(SubType.MERCENARY)); + filter.add(SubType.MERCENARY.getPredicate()); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); } diff --git a/Mage.Sets/src/mage/cards/c/CateranEnforcer.java b/Mage.Sets/src/mage/cards/c/CateranEnforcer.java index 8788f46a6f..fbbde80068 100644 --- a/Mage.Sets/src/mage/cards/c/CateranEnforcer.java +++ b/Mage.Sets/src/mage/cards/c/CateranEnforcer.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -30,7 +29,7 @@ public final class CateranEnforcer extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with converted mana cost 4 or less"); static { - filter.add(new SubtypePredicate(SubType.MERCENARY)); + filter.add(SubType.MERCENARY.getPredicate()); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 5)); } diff --git a/Mage.Sets/src/mage/cards/c/CateranKidnappers.java b/Mage.Sets/src/mage/cards/c/CateranKidnappers.java index 9881ba568f..192eb90b66 100644 --- a/Mage.Sets/src/mage/cards/c/CateranKidnappers.java +++ b/Mage.Sets/src/mage/cards/c/CateranKidnappers.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -28,7 +27,7 @@ public final class CateranKidnappers extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with converted mana cost 3 or less"); static { - filter.add(new SubtypePredicate(SubType.MERCENARY)); + filter.add(SubType.MERCENARY.getPredicate()); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); } diff --git a/Mage.Sets/src/mage/cards/c/CateranOverlord.java b/Mage.Sets/src/mage/cards/c/CateranOverlord.java index 7b9fda255f..b77caa1990 100644 --- a/Mage.Sets/src/mage/cards/c/CateranOverlord.java +++ b/Mage.Sets/src/mage/cards/c/CateranOverlord.java @@ -19,7 +19,6 @@ import mage.constants.Zone; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledCreaturePermanent; @@ -32,7 +31,7 @@ public final class CateranOverlord extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with converted mana cost 6 or less"); static { - filter.add(new SubtypePredicate(SubType.MERCENARY)); + filter.add(SubType.MERCENARY.getPredicate()); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 7)); } diff --git a/Mage.Sets/src/mage/cards/c/CateranPersuader.java b/Mage.Sets/src/mage/cards/c/CateranPersuader.java index cb7b5914f1..f367bffca3 100644 --- a/Mage.Sets/src/mage/cards/c/CateranPersuader.java +++ b/Mage.Sets/src/mage/cards/c/CateranPersuader.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -29,7 +28,7 @@ public final class CateranPersuader extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with converted mana cost 1 or less"); static { - filter.add(new SubtypePredicate(SubType.MERCENARY)); + filter.add(SubType.MERCENARY.getPredicate()); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 2)); } diff --git a/Mage.Sets/src/mage/cards/c/CateranSlaver.java b/Mage.Sets/src/mage/cards/c/CateranSlaver.java index 97cf20d76e..70ce748362 100644 --- a/Mage.Sets/src/mage/cards/c/CateranSlaver.java +++ b/Mage.Sets/src/mage/cards/c/CateranSlaver.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -30,7 +29,7 @@ public final class CateranSlaver extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with converted mana cost 5 or less"); static { - filter.add(new SubtypePredicate(SubType.MERCENARY)); + filter.add(SubType.MERCENARY.getPredicate()); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 6)); } diff --git a/Mage.Sets/src/mage/cards/c/CateranSummons.java b/Mage.Sets/src/mage/cards/c/CateranSummons.java index 14ff937e1a..4ab65636f9 100644 --- a/Mage.Sets/src/mage/cards/c/CateranSummons.java +++ b/Mage.Sets/src/mage/cards/c/CateranSummons.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -22,7 +21,7 @@ public final class CateranSummons extends CardImpl { private static final FilterCard filter = new FilterCreatureCard("Mercenary card"); static { - filter.add(new SubtypePredicate(SubType.MERCENARY)); + filter.add(SubType.MERCENARY.getPredicate()); } public CateranSummons(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CaterwaulingBoggart.java b/Mage.Sets/src/mage/cards/c/CaterwaulingBoggart.java index 41b4d6d687..8d39bb8bcb 100644 --- a/Mage.Sets/src/mage/cards/c/CaterwaulingBoggart.java +++ b/Mage.Sets/src/mage/cards/c/CaterwaulingBoggart.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,8 +25,8 @@ public final class CaterwaulingBoggart extends CardImpl { private static final FilterPermanent filterElemental = new FilterControlledCreaturePermanent("Elemental"); static { - filterGoblin.add(new SubtypePredicate(SubType.GOBLIN)); - filterElemental.add(new SubtypePredicate(SubType.ELEMENTAL)); + filterGoblin.add(SubType.GOBLIN.getPredicate()); + filterElemental.add(SubType.ELEMENTAL.getPredicate()); } public CaterwaulingBoggart(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CaughtInTheBrights.java b/Mage.Sets/src/mage/cards/c/CaughtInTheBrights.java index a007489f92..b625d34334 100644 --- a/Mage.Sets/src/mage/cards/c/CaughtInTheBrights.java +++ b/Mage.Sets/src/mage/cards/c/CaughtInTheBrights.java @@ -13,7 +13,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -28,7 +27,7 @@ public final class CaughtInTheBrights extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.VEHICLE)); + filter.add(SubType.VEHICLE.getPredicate()); } public CaughtInTheBrights(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CavalryPegasus.java b/Mage.Sets/src/mage/cards/c/CavalryPegasus.java index 6d46fa8c7c..0ab34098cc 100644 --- a/Mage.Sets/src/mage/cards/c/CavalryPegasus.java +++ b/Mage.Sets/src/mage/cards/c/CavalryPegasus.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AttackingPredicate; /** @@ -24,7 +23,7 @@ public final class CavalryPegasus extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("each attacking Human"); static { - filter.add(new SubtypePredicate(SubType.HUMAN)); + filter.add(SubType.HUMAN.getPredicate()); filter.add(AttackingPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/c/CeaselessSearblades.java b/Mage.Sets/src/mage/cards/c/CeaselessSearblades.java index 2b15987b8c..9bef4309c5 100644 --- a/Mage.Sets/src/mage/cards/c/CeaselessSearblades.java +++ b/Mage.Sets/src/mage/cards/c/CeaselessSearblades.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -51,7 +50,7 @@ class CeaselessSearbladesTriggeredAbility extends TriggeredAbilityImpl { private static final FilterCard filter = new FilterCard("an Elemental"); static { - filter.add(new SubtypePredicate(SubType.ELEMENTAL)); + filter.add(SubType.ELEMENTAL.getPredicate()); } CeaselessSearbladesTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/c/CelestialGatekeeper.java b/Mage.Sets/src/mage/cards/c/CelestialGatekeeper.java index 1208be37ef..552d39dc32 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialGatekeeper.java +++ b/Mage.Sets/src/mage/cards/c/CelestialGatekeeper.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.other.OwnerPredicate; import mage.target.common.TargetCardInGraveyard; @@ -30,8 +29,8 @@ public final class CelestialGatekeeper extends CardImpl { static { filter.add(new OwnerPredicate(TargetController.YOU)); filter.add(Predicates.or( - new SubtypePredicate(SubType.BIRD), - new SubtypePredicate(SubType.CLERIC) + SubType.BIRD.getPredicate(), + SubType.CLERIC.getPredicate() )); } diff --git a/Mage.Sets/src/mage/cards/c/CemeteryReaper.java b/Mage.Sets/src/mage/cards/c/CemeteryReaper.java index abaeedb113..686e1afa59 100644 --- a/Mage.Sets/src/mage/cards/c/CemeteryReaper.java +++ b/Mage.Sets/src/mage/cards/c/CemeteryReaper.java @@ -19,7 +19,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.ZombieToken; import mage.target.common.TargetCardInGraveyard; @@ -31,7 +30,7 @@ public final class CemeteryReaper extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Zombie creatures"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public CemeteryReaper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CennsHeir.java b/Mage.Sets/src/mage/cards/c/CennsHeir.java index c5dc2acad2..079931c3ea 100644 --- a/Mage.Sets/src/mage/cards/c/CennsHeir.java +++ b/Mage.Sets/src/mage/cards/c/CennsHeir.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -24,7 +23,7 @@ public final class CennsHeir extends CardImpl { private static final FilterAttackingCreature filter = new FilterAttackingCreature("other attacking Kithkin"); static { - filter.add(new SubtypePredicate(SubType.KITHKIN)); + filter.add(SubType.KITHKIN.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/c/CennsTactician.java b/Mage.Sets/src/mage/cards/c/CennsTactician.java index b82ab625c0..c05481331b 100644 --- a/Mage.Sets/src/mage/cards/c/CennsTactician.java +++ b/Mage.Sets/src/mage/cards/c/CennsTactician.java @@ -16,7 +16,6 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.CounterPredicate; import mage.target.common.TargetCreaturePermanent; @@ -29,7 +28,7 @@ public final class CennsTactician extends CardImpl { private static final FilterCreaturePermanent filterSoldier = new FilterCreaturePermanent("Soldier creature"); private static final FilterControlledCreaturePermanent filterCounter = new FilterControlledCreaturePermanent("Each creature you control with a +1/+1 counter on it"); static { - filterSoldier.add(new SubtypePredicate(SubType.SOLDIER)); + filterSoldier.add(SubType.SOLDIER.getPredicate()); filterCounter.add(new CounterPredicate(CounterType.P1P1)); } diff --git a/Mage.Sets/src/mage/cards/c/ChainedToTheRocks.java b/Mage.Sets/src/mage/cards/c/ChainedToTheRocks.java index 31295d0de5..4cff3a1597 100644 --- a/Mage.Sets/src/mage/cards/c/ChainedToTheRocks.java +++ b/Mage.Sets/src/mage/cards/c/ChainedToTheRocks.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -67,7 +66,7 @@ public final class ChainedToTheRocks extends CardImpl { private static final FilterCreaturePermanent filterTarget = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); filterTarget.add(new ControllerPredicate(TargetController.OPPONENT)); } diff --git a/Mage.Sets/src/mage/cards/c/ChainerDementiaMaster.java b/Mage.Sets/src/mage/cards/c/ChainerDementiaMaster.java index 31f76824dc..eff3d16be7 100644 --- a/Mage.Sets/src/mage/cards/c/ChainerDementiaMaster.java +++ b/Mage.Sets/src/mage/cards/c/ChainerDementiaMaster.java @@ -23,7 +23,6 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -39,8 +38,8 @@ public final class ChainerDementiaMaster extends CardImpl { private static final FilterCreaturePermanent filterCreature = new FilterCreaturePermanent("Nightmare creatures"); private static final FilterPermanent filterPermanent = new FilterPermanent("Nightmares"); static { - filterCreature.add(new SubtypePredicate(SubType.NIGHTMARE)); - filterPermanent.add(new SubtypePredicate(SubType.NIGHTMARE)); + filterCreature.add(SubType.NIGHTMARE.getPredicate()); + filterPermanent.add(SubType.NIGHTMARE.getPredicate()); } public ChainerDementiaMaster(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ChampionOfDusk.java b/Mage.Sets/src/mage/cards/c/ChampionOfDusk.java index dedfdaa9de..aef237b5fb 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionOfDusk.java +++ b/Mage.Sets/src/mage/cards/c/ChampionOfDusk.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -26,7 +25,7 @@ public final class ChampionOfDusk extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Vampires you control"); static { - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); } public ChampionOfDusk(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ChampionOfTheParish.java b/Mage.Sets/src/mage/cards/c/ChampionOfTheParish.java index 617487fb23..a756faca95 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionOfTheParish.java +++ b/Mage.Sets/src/mage/cards/c/ChampionOfTheParish.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -23,7 +22,7 @@ public final class ChampionOfTheParish extends CardImpl { private static final FilterPermanent filter = new FilterControlledCreaturePermanent("another Human"); static { - filter.add(new SubtypePredicate(SubType.HUMAN)); + filter.add(SubType.HUMAN.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/c/ChandraAwakenedInferno.java b/Mage.Sets/src/mage/cards/c/ChandraAwakenedInferno.java index 76591867ab..c0f61cb557 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraAwakenedInferno.java +++ b/Mage.Sets/src/mage/cards/c/ChandraAwakenedInferno.java @@ -21,7 +21,6 @@ import mage.constants.SuperType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.command.emblems.ChandraAwakenedInfernoEmblem; import mage.target.common.TargetCreatureOrPlaneswalker; @@ -36,7 +35,7 @@ public final class ChandraAwakenedInferno extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("non-Elemental creature"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.ELEMENTAL))); + filter.add(Predicates.not(SubType.ELEMENTAL.getPredicate())); } public ChandraAwakenedInferno(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ChandraGremlinWrangler.java b/Mage.Sets/src/mage/cards/c/ChandraGremlinWrangler.java index d17dea561b..643baa27a8 100644 --- a/Mage.Sets/src/mage/cards/c/ChandraGremlinWrangler.java +++ b/Mage.Sets/src/mage/cards/c/ChandraGremlinWrangler.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.GremlinToken; import mage.target.common.TargetAnyTarget; @@ -28,7 +27,7 @@ public final class ChandraGremlinWrangler extends CardImpl { private static final FilterPermanent filter = new FilterControlledPermanent(); static { - filter.add(new SubtypePredicate(SubType.GREMLIN)); + filter.add(SubType.GREMLIN.getPredicate()); } private static final DynamicValue xValue = new PermanentsOnBattlefieldCount(filter); diff --git a/Mage.Sets/src/mage/cards/c/ChandrasDefeat.java b/Mage.Sets/src/mage/cards/c/ChandrasDefeat.java index 047d6d5565..a8cff5456c 100644 --- a/Mage.Sets/src/mage/cards/c/ChandrasDefeat.java +++ b/Mage.Sets/src/mage/cards/c/ChandrasDefeat.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -56,7 +55,7 @@ class ChandrasDefeatEffect extends OneShotEffect { static { filter.add(CardType.PLANESWALKER.getPredicate()); - filter.add(new SubtypePredicate(SubType.CHANDRA)); + filter.add(SubType.CHANDRA.getPredicate()); } public ChandrasDefeatEffect() { diff --git a/Mage.Sets/src/mage/cards/c/ChandrasRegulator.java b/Mage.Sets/src/mage/cards/c/ChandrasRegulator.java index 3d308576d6..29a5a4b730 100644 --- a/Mage.Sets/src/mage/cards/c/ChandrasRegulator.java +++ b/Mage.Sets/src/mage/cards/c/ChandrasRegulator.java @@ -18,7 +18,6 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -37,7 +36,7 @@ public final class ChandrasRegulator extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.MOUNTAIN), + SubType.MOUNTAIN.getPredicate(), new ColorPredicate(ObjectColor.RED) )); } diff --git a/Mage.Sets/src/mage/cards/c/ChaosCharm.java b/Mage.Sets/src/mage/cards/c/ChaosCharm.java index e90b303b79..d98d76cefd 100644 --- a/Mage.Sets/src/mage/cards/c/ChaosCharm.java +++ b/Mage.Sets/src/mage/cards/c/ChaosCharm.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -26,7 +25,7 @@ public final class ChaosCharm extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Wall"); static { - filter.add(new SubtypePredicate(SubType.WALL)); + filter.add(SubType.WALL.getPredicate()); } public ChaosCharm(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ChaosMoon.java b/Mage.Sets/src/mage/cards/c/ChaosMoon.java index 2e594d83ef..2d3e2b753c 100644 --- a/Mage.Sets/src/mage/cards/c/ChaosMoon.java +++ b/Mage.Sets/src/mage/cards/c/ChaosMoon.java @@ -21,7 +21,6 @@ import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -100,7 +99,7 @@ class ChaosMoonOddTriggeredAbility extends DelayedTriggeredManaAbility { private static final FilterLandPermanent filter = new FilterLandPermanent("Mountain"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public ChaosMoonOddTriggeredAbility() { @@ -145,7 +144,7 @@ class ChaosMoonEvenReplacementEffect extends ReplacementEffectImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Mountain"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } ChaosMoonEvenReplacementEffect() { diff --git a/Mage.Sets/src/mage/cards/c/CherishedHatchling.java b/Mage.Sets/src/mage/cards/c/CherishedHatchling.java index a4bfcdfa48..81c972d53f 100644 --- a/Mage.Sets/src/mage/cards/c/CherishedHatchling.java +++ b/Mage.Sets/src/mage/cards/c/CherishedHatchling.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -35,7 +34,7 @@ public final class CherishedHatchling extends CardImpl { private static final FilterCard filterCard = new FilterCard("Dinosaur spells"); static { - filterCard.add(new SubtypePredicate(SubType.DINOSAUR)); + filterCard.add(SubType.DINOSAUR.getPredicate()); } public CherishedHatchling(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ChickenALaKing.java b/Mage.Sets/src/mage/cards/c/ChickenALaKing.java index db786af300..85734b991b 100644 --- a/Mage.Sets/src/mage/cards/c/ChickenALaKing.java +++ b/Mage.Sets/src/mage/cards/c/ChickenALaKing.java @@ -18,7 +18,6 @@ import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -34,7 +33,7 @@ public final class ChickenALaKing extends CardImpl { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new SubtypePredicate(SubType.CHICKEN)); + filter.add(SubType.CHICKEN.getPredicate()); } public ChickenALaKing(UUID ownerId, CardSetInfo setInfo) { @@ -66,7 +65,7 @@ class ChickenALaKingTriggeredAbility extends TriggeredAbilityImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("each Chicken"); static { - filter.add(new SubtypePredicate(SubType.CHICKEN)); + filter.add(SubType.CHICKEN.getPredicate()); } public ChickenALaKingTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/c/ChiefChirpa.java b/Mage.Sets/src/mage/cards/c/ChiefChirpa.java index 5cd547a440..5a6e153ea1 100644 --- a/Mage.Sets/src/mage/cards/c/ChiefChirpa.java +++ b/Mage.Sets/src/mage/cards/c/ChiefChirpa.java @@ -20,7 +20,6 @@ import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.EwokToken; @@ -39,7 +38,7 @@ public final class ChiefChirpa extends CardImpl { diedFilter.add(new ColorPredicate(ObjectColor.GREEN)); diedFilter.add(new ControllerPredicate(TargetController.YOU)); - ewokFilter.add(new SubtypePredicate(SubType.EWOK)); + ewokFilter.add(SubType.EWOK.getPredicate()); ewokFilter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/c/ChiefOfTheEdge.java b/Mage.Sets/src/mage/cards/c/ChiefOfTheEdge.java index 8f37321e12..4d20964317 100644 --- a/Mage.Sets/src/mage/cards/c/ChiefOfTheEdge.java +++ b/Mage.Sets/src/mage/cards/c/ChiefOfTheEdge.java @@ -12,7 +12,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -23,7 +22,7 @@ public final class ChiefOfTheEdge extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Warrior creatures"); static { - filter.add(new SubtypePredicate(SubType.WARRIOR)); + filter.add(SubType.WARRIOR.getPredicate()); } public ChiefOfTheEdge(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ChiefOfTheScale.java b/Mage.Sets/src/mage/cards/c/ChiefOfTheScale.java index 9a4b5555b6..212ae35d77 100644 --- a/Mage.Sets/src/mage/cards/c/ChiefOfTheScale.java +++ b/Mage.Sets/src/mage/cards/c/ChiefOfTheScale.java @@ -12,7 +12,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -23,7 +22,7 @@ public final class ChiefOfTheScale extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Warrior creatures"); static { - filter.add(new SubtypePredicate(SubType.WARRIOR)); + filter.add(SubType.WARRIOR.getPredicate()); } public ChiefOfTheScale(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ChoArrimLegate.java b/Mage.Sets/src/mage/cards/c/ChoArrimLegate.java index 22c24cc6b9..1cca23881e 100644 --- a/Mage.Sets/src/mage/cards/c/ChoArrimLegate.java +++ b/Mage.Sets/src/mage/cards/c/ChoArrimLegate.java @@ -15,7 +15,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -27,8 +26,8 @@ public final class ChoArrimLegate extends CardImpl { private static final FilterPermanent filterSwamp = new FilterPermanent(); static { - filterPlains.add(new SubtypePredicate(SubType.PLAINS)); - filterSwamp.add(new SubtypePredicate(SubType.SWAMP)); + filterPlains.add(SubType.PLAINS.getPredicate()); + filterSwamp.add(SubType.SWAMP.getPredicate()); } public ChoArrimLegate(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/Choke.java b/Mage.Sets/src/mage/cards/c/Choke.java index 4420eb67f0..f9bd198ab6 100644 --- a/Mage.Sets/src/mage/cards/c/Choke.java +++ b/Mage.Sets/src/mage/cards/c/Choke.java @@ -8,7 +8,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -19,7 +18,7 @@ public final class Choke extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Islands"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } public Choke(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ChokedEstuary.java b/Mage.Sets/src/mage/cards/c/ChokedEstuary.java index 5665a6b85c..c20152b3a1 100644 --- a/Mage.Sets/src/mage/cards/c/ChokedEstuary.java +++ b/Mage.Sets/src/mage/cards/c/ChokedEstuary.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; /** @@ -25,8 +24,8 @@ public final class ChokedEstuary extends CardImpl { private static final FilterCard filter = new FilterCard("an Island or Swamp card from your hand"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.ISLAND), - new SubtypePredicate(SubType.SWAMP))); + filter.add(Predicates.or(SubType.ISLAND.getPredicate(), + SubType.SWAMP.getPredicate())); } public ChokedEstuary(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ChokingSands.java b/Mage.Sets/src/mage/cards/c/ChokingSands.java index ce8d481553..f32f9f4c05 100644 --- a/Mage.Sets/src/mage/cards/c/ChokingSands.java +++ b/Mage.Sets/src/mage/cards/c/ChokingSands.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -28,7 +27,7 @@ public final class ChokingSands extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("non-Swamp land"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.SWAMP))); + filter.add(Predicates.not(SubType.SWAMP.getPredicate())); } public ChokingSands(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ChosenOfMarkov.java b/Mage.Sets/src/mage/cards/c/ChosenOfMarkov.java index e4771fc0e7..976d053e4f 100644 --- a/Mage.Sets/src/mage/cards/c/ChosenOfMarkov.java +++ b/Mage.Sets/src/mage/cards/c/ChosenOfMarkov.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -29,7 +28,7 @@ public final class ChosenOfMarkov extends CardImpl { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); } public ChosenOfMarkov(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CircuitousRoute.java b/Mage.Sets/src/mage/cards/c/CircuitousRoute.java index e7003d1818..40c08bb80f 100644 --- a/Mage.Sets/src/mage/cards/c/CircuitousRoute.java +++ b/Mage.Sets/src/mage/cards/c/CircuitousRoute.java @@ -9,7 +9,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; @@ -27,7 +26,7 @@ public final class CircuitousRoute extends CardImpl { Predicates.and( CardType.LAND.getPredicate(), new SupertypePredicate(SuperType.BASIC) - ), new SubtypePredicate(SubType.GATE) + ), SubType.GATE.getPredicate() )); } diff --git a/Mage.Sets/src/mage/cards/c/ClashOfRealities.java b/Mage.Sets/src/mage/cards/c/ClashOfRealities.java index 4c4b56adbd..6640baddb8 100644 --- a/Mage.Sets/src/mage/cards/c/ClashOfRealities.java +++ b/Mage.Sets/src/mage/cards/c/ClashOfRealities.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -29,8 +28,8 @@ public final class ClashOfRealities extends CardImpl { private static final FilterCreaturePermanent filterNotSpirit = new FilterCreaturePermanent("non-Spirit creature"); static { - filterSpirit.add(new SubtypePredicate(SubType.SPIRIT)); - filterNotSpirit.add(Predicates.not(new SubtypePredicate(SubType.SPIRIT))); + filterSpirit.add(SubType.SPIRIT.getPredicate()); + filterNotSpirit.add(Predicates.not(SubType.SPIRIT.getPredicate())); } public ClashOfRealities(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ClawsOfValakut.java b/Mage.Sets/src/mage/cards/c/ClawsOfValakut.java index 6e9d4440e1..f2994ad82b 100644 --- a/Mage.Sets/src/mage/cards/c/ClawsOfValakut.java +++ b/Mage.Sets/src/mage/cards/c/ClawsOfValakut.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -28,7 +27,7 @@ public final class ClawsOfValakut extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Mountain you control"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/c/CleansingRay.java b/Mage.Sets/src/mage/cards/c/CleansingRay.java index 52bc1eb902..b67dd4356f 100644 --- a/Mage.Sets/src/mage/cards/c/CleansingRay.java +++ b/Mage.Sets/src/mage/cards/c/CleansingRay.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetEnchantmentPermanent; @@ -26,7 +25,7 @@ public final class CleansingRay extends CardImpl { // - Destroy target Vampire. getSpellAbility().addEffect(new DestroyTargetEffect()); FilterPermanent filter = new FilterPermanent("Vampire"); - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); getSpellAbility().addTarget(new TargetPermanent(filter)); // - Destroy target enchantment. diff --git a/Mage.Sets/src/mage/cards/c/Clickslither.java b/Mage.Sets/src/mage/cards/c/Clickslither.java index 909deddc14..55317c1f64 100644 --- a/Mage.Sets/src/mage/cards/c/Clickslither.java +++ b/Mage.Sets/src/mage/cards/c/Clickslither.java @@ -18,7 +18,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -30,7 +29,7 @@ public final class Clickslither extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a Goblin"); static { - filter.add(new SubtypePredicate((SubType.GOBLIN))); + filter.add(SubType.GOBLIN.getPredicate()); } public Clickslither(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ClifftopRetreat.java b/Mage.Sets/src/mage/cards/c/ClifftopRetreat.java index a75c2c9911..59001ec551 100644 --- a/Mage.Sets/src/mage/cards/c/ClifftopRetreat.java +++ b/Mage.Sets/src/mage/cards/c/ClifftopRetreat.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -28,7 +27,7 @@ public final class ClifftopRetreat extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.MOUNTAIN), new SubtypePredicate(SubType.PLAINS))); + filter.add(Predicates.or(SubType.MOUNTAIN.getPredicate(), SubType.PLAINS.getPredicate())); } public ClifftopRetreat(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CloakAndDagger.java b/Mage.Sets/src/mage/cards/c/CloakAndDagger.java index aa7eba725c..11a8d9f1bd 100644 --- a/Mage.Sets/src/mage/cards/c/CloakAndDagger.java +++ b/Mage.Sets/src/mage/cards/c/CloakAndDagger.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -27,7 +26,7 @@ public final class CloakAndDagger extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("a Rogue creature"); static { - filter.add(new SubtypePredicate(SubType.ROGUE)); + filter.add(SubType.ROGUE.getPredicate()); } public CloakAndDagger(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CloakOfInvisibility.java b/Mage.Sets/src/mage/cards/c/CloakOfInvisibility.java index 0f9d4dd309..073be81428 100644 --- a/Mage.Sets/src/mage/cards/c/CloakOfInvisibility.java +++ b/Mage.Sets/src/mage/cards/c/CloakOfInvisibility.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -25,7 +24,7 @@ import mage.target.common.TargetCreaturePermanent; public final class CloakOfInvisibility extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("except by Walls"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.WALL))); + filter.add(Predicates.not(SubType.WALL.getPredicate())); } public CloakOfInvisibility(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ClockworkSwarm.java b/Mage.Sets/src/mage/cards/c/ClockworkSwarm.java index 0cd0288d2e..9b00bda8c2 100644 --- a/Mage.Sets/src/mage/cards/c/ClockworkSwarm.java +++ b/Mage.Sets/src/mage/cards/c/ClockworkSwarm.java @@ -29,7 +29,6 @@ import mage.counters.Counter; import mage.counters.CounterType; import mage.counters.Counters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.watchers.common.AttackedOrBlockedThisCombatWatcher; @@ -42,7 +41,7 @@ public final class ClockworkSwarm extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Walls"); static { - filter.add(new SubtypePredicate(SubType.WALL)); + filter.add(SubType.WALL.getPredicate()); } public ClockworkSwarm(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ClotSliver.java b/Mage.Sets/src/mage/cards/c/ClotSliver.java index d5e1599bee..e7bd0f9039 100644 --- a/Mage.Sets/src/mage/cards/c/ClotSliver.java +++ b/Mage.Sets/src/mage/cards/c/ClotSliver.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @author Loki @@ -25,7 +24,7 @@ public final class ClotSliver extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Slivers"); static { - filter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); } public ClotSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CloudgoatRanger.java b/Mage.Sets/src/mage/cards/c/CloudgoatRanger.java index 1172299866..562774a89b 100644 --- a/Mage.Sets/src/mage/cards/c/CloudgoatRanger.java +++ b/Mage.Sets/src/mage/cards/c/CloudgoatRanger.java @@ -20,7 +20,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.permanent.token.KithkinToken; import mage.target.common.TargetControlledPermanent; @@ -35,7 +34,7 @@ public final class CloudgoatRanger extends CardImpl { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new SubtypePredicate(SubType.KITHKIN)); + filter.add(SubType.KITHKIN.getPredicate()); } public CloudgoatRanger(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/Cloudpost.java b/Mage.Sets/src/mage/cards/c/Cloudpost.java index 7256aaff08..8835e03274 100644 --- a/Mage.Sets/src/mage/cards/c/Cloudpost.java +++ b/Mage.Sets/src/mage/cards/c/Cloudpost.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class Cloudpost extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Locus on the battlefield"); static { - filter.add(new SubtypePredicate(SubType.LOCUS)); + filter.add(SubType.LOCUS.getPredicate()); } public Cloudpost(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CloudreachCavalry.java b/Mage.Sets/src/mage/cards/c/CloudreachCavalry.java index 9a2492c7cc..d5cf745256 100644 --- a/Mage.Sets/src/mage/cards/c/CloudreachCavalry.java +++ b/Mage.Sets/src/mage/cards/c/CloudreachCavalry.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -28,7 +27,7 @@ public final class CloudreachCavalry extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Bird"); static { - filter.add(new SubtypePredicate(SubType.BIRD)); + filter.add(SubType.BIRD.getPredicate()); } public CloudreachCavalry(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CoalitionVictory.java b/Mage.Sets/src/mage/cards/c/CoalitionVictory.java index fdd4571752..35d9526c47 100644 --- a/Mage.Sets/src/mage/cards/c/CoalitionVictory.java +++ b/Mage.Sets/src/mage/cards/c/CoalitionVictory.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; /** @@ -34,11 +33,11 @@ public final class CoalitionVictory extends CardImpl { static final FilterControlledCreaturePermanent filterGreen = new FilterControlledCreaturePermanent(); static { - filterPlains.add(new SubtypePredicate(SubType.PLAINS)); - filterIsland.add(new SubtypePredicate(SubType.ISLAND)); - filterSwamp.add(new SubtypePredicate(SubType.SWAMP)); - filterMountain.add(new SubtypePredicate(SubType.MOUNTAIN)); - filterForest.add(new SubtypePredicate(SubType.FOREST)); + filterPlains.add(SubType.PLAINS.getPredicate()); + filterIsland.add(SubType.ISLAND.getPredicate()); + filterSwamp.add(SubType.SWAMP.getPredicate()); + filterMountain.add(SubType.MOUNTAIN.getPredicate()); + filterForest.add(SubType.FOREST.getPredicate()); filterWhite.add(new ColorPredicate(ObjectColor.WHITE)); filterBlue.add(new ColorPredicate(ObjectColor.BLUE)); filterBlack.add(new ColorPredicate(ObjectColor.BLACK)); diff --git a/Mage.Sets/src/mage/cards/c/CoaxFromTheBlindEternities.java b/Mage.Sets/src/mage/cards/c/CoaxFromTheBlindEternities.java index b3bd471831..1187fc1b58 100644 --- a/Mage.Sets/src/mage/cards/c/CoaxFromTheBlindEternities.java +++ b/Mage.Sets/src/mage/cards/c/CoaxFromTheBlindEternities.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -19,7 +18,7 @@ public final class CoaxFromTheBlindEternities extends CardImpl { private static final FilterCard filter = new FilterCard("an Eldrazi card"); static { - filter.add(new SubtypePredicate(SubType.ELDRAZI)); + filter.add(SubType.ELDRAZI.getPredicate()); } public CoaxFromTheBlindEternities(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/Cockatrice.java b/Mage.Sets/src/mage/cards/c/Cockatrice.java index 8a97e81165..cd45ae14a3 100644 --- a/Mage.Sets/src/mage/cards/c/Cockatrice.java +++ b/Mage.Sets/src/mage/cards/c/Cockatrice.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class Cockatrice extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Wall creature"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.WALL))); + filter.add(Predicates.not(SubType.WALL.getPredicate())); } public Cockatrice(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CoffinPuppets.java b/Mage.Sets/src/mage/cards/c/CoffinPuppets.java index 621ce06321..fd275289d2 100644 --- a/Mage.Sets/src/mage/cards/c/CoffinPuppets.java +++ b/Mage.Sets/src/mage/cards/c/CoffinPuppets.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import java.util.UUID; @@ -33,7 +32,7 @@ public final class CoffinPuppets extends CardImpl { = new FilterControlledLandPermanent("two lands"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } private static final Condition condition = new CompoundCondition( diff --git a/Mage.Sets/src/mage/cards/c/CommanderCody.java b/Mage.Sets/src/mage/cards/c/CommanderCody.java index 2b20b390fa..371b118344 100644 --- a/Mage.Sets/src/mage/cards/c/CommanderCody.java +++ b/Mage.Sets/src/mage/cards/c/CommanderCody.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.TrooperToken; @@ -26,7 +25,7 @@ public final class CommanderCody extends CardImpl { static { filter.add(Predicates.not(TokenPredicate.instance)); - filter.add(new SubtypePredicate(SubType.TROOPER)); + filter.add(SubType.TROOPER.getPredicate()); } public CommanderCody(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CommuneWithDinosaurs.java b/Mage.Sets/src/mage/cards/c/CommuneWithDinosaurs.java index 9a4eae5fdc..a98697190a 100644 --- a/Mage.Sets/src/mage/cards/c/CommuneWithDinosaurs.java +++ b/Mage.Sets/src/mage/cards/c/CommuneWithDinosaurs.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -23,7 +22,7 @@ public final class CommuneWithDinosaurs extends CardImpl { static { filter.add(Predicates.or( CardType.LAND.getPredicate(), - new SubtypePredicate(SubType.DINOSAUR) + SubType.DINOSAUR.getPredicate() )); } diff --git a/Mage.Sets/src/mage/cards/c/CompanionOfTheTrials.java b/Mage.Sets/src/mage/cards/c/CompanionOfTheTrials.java index 4050b8c37f..8d06c7a96b 100644 --- a/Mage.Sets/src/mage/cards/c/CompanionOfTheTrials.java +++ b/Mage.Sets/src/mage/cards/c/CompanionOfTheTrials.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPlaneswalkerPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -27,7 +26,7 @@ public final class CompanionOfTheTrials extends CardImpl { private static final FilterPlaneswalkerPermanent filter = new FilterPlaneswalkerPermanent("you control a Gideon planeswalker"); static { - filter.add(new SubtypePredicate(SubType.GIDEON)); + filter.add(SubType.GIDEON.getPredicate()); } public CompanionOfTheTrials(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CompellingDeterrence.java b/Mage.Sets/src/mage/cards/c/CompellingDeterrence.java index 4be944df32..4fb628199e 100644 --- a/Mage.Sets/src/mage/cards/c/CompellingDeterrence.java +++ b/Mage.Sets/src/mage/cards/c/CompellingDeterrence.java @@ -11,7 +11,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -66,7 +65,7 @@ class CompellingDeterrenceEffect extends OneShotEffect { player.moveCards(target, Zone.HAND, source, game); game.applyEffects(); FilterPermanent zombieFilter = new FilterPermanent(); - zombieFilter.add(new SubtypePredicate(SubType.ZOMBIE)); + zombieFilter.add(SubType.ZOMBIE.getPredicate()); if (game.getState().getBattlefield().countAll(zombieFilter, controller.getId(), game) > 0) { player.discard(1, false, source, game); } diff --git a/Mage.Sets/src/mage/cards/c/ConfrontTheUnknown.java b/Mage.Sets/src/mage/cards/c/ConfrontTheUnknown.java index 71ceae19e2..0d96ce2bcf 100644 --- a/Mage.Sets/src/mage/cards/c/ConfrontTheUnknown.java +++ b/Mage.Sets/src/mage/cards/c/ConfrontTheUnknown.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class ConfrontTheUnknown extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("each Clue you control"); static { - filter.add(new SubtypePredicate(SubType.CLUE)); + filter.add(SubType.CLUE.getPredicate()); } public ConfrontTheUnknown(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ConsumingBonfire.java b/Mage.Sets/src/mage/cards/c/ConsumingBonfire.java index d85c4b9d3b..cce655b49d 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumingBonfire.java +++ b/Mage.Sets/src/mage/cards/c/ConsumingBonfire.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -25,9 +24,9 @@ public final class ConsumingBonfire extends CardImpl { static { filter.add(CardType.CREATURE.getPredicate()); - filter.add(Predicates.not(new SubtypePredicate(SubType.ELEMENTAL))); + filter.add(Predicates.not(SubType.ELEMENTAL.getPredicate())); filter2.add(CardType.CREATURE.getPredicate()); - filter2.add(new SubtypePredicate(SubType.TREEFOLK)); + filter2.add(SubType.TREEFOLK.getPredicate()); } public ConsumingBonfire(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ConsumingFerocity.java b/Mage.Sets/src/mage/cards/c/ConsumingFerocity.java index 10650060e2..5dfb3d96f4 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumingFerocity.java +++ b/Mage.Sets/src/mage/cards/c/ConsumingFerocity.java @@ -24,7 +24,6 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -39,7 +38,7 @@ public final class ConsumingFerocity extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Wall creature"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.WALL))); + filter.add(Predicates.not(SubType.WALL.getPredicate())); } public ConsumingFerocity(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ContestedCliffs.java b/Mage.Sets/src/mage/cards/c/ContestedCliffs.java index bf8d447bdd..4ae8afdec0 100644 --- a/Mage.Sets/src/mage/cards/c/ContestedCliffs.java +++ b/Mage.Sets/src/mage/cards/c/ContestedCliffs.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; @@ -31,7 +30,7 @@ public final class ContestedCliffs extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("creature an opponent controls"); static { filter1.add(new ControllerPredicate(TargetController.YOU)); - filter1.add(new SubtypePredicate(SubType.BEAST)); + filter1.add(SubType.BEAST.getPredicate()); filter2.add(new ControllerPredicate(TargetController.OPPONENT)); } diff --git a/Mage.Sets/src/mage/cards/c/CoordinatedBarrage.java b/Mage.Sets/src/mage/cards/c/CoordinatedBarrage.java index c2b159f502..33c621edc5 100644 --- a/Mage.Sets/src/mage/cards/c/CoordinatedBarrage.java +++ b/Mage.Sets/src/mage/cards/c/CoordinatedBarrage.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -67,7 +66,7 @@ class CoordinatedBarrageEffect extends OneShotEffect { if (controller.choose(Outcome.Damage, choice, game)) { String chosenType = choice.getChoice(); FilterControlledPermanent filter = new FilterControlledPermanent(); - filter.add(new SubtypePredicate(SubType.byDescription(chosenType))); + filter.add(SubType.byDescription(chosenType).getPredicate()); int damageDealt = game.getBattlefield().count(filter, source.getSourceId(), source.getControllerId(), game); Permanent permanent = game.getPermanent(this.getTargetPointer().getFirst(game, source)); if (permanent != null) { diff --git a/Mage.Sets/src/mage/cards/c/CoralAtoll.java b/Mage.Sets/src/mage/cards/c/CoralAtoll.java index 92a7ab94cf..b084d0e6ad 100644 --- a/Mage.Sets/src/mage/cards/c/CoralAtoll.java +++ b/Mage.Sets/src/mage/cards/c/CoralAtoll.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -29,7 +28,7 @@ public final class CoralAtoll extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("an untapped Island"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/c/CoralReef.java b/Mage.Sets/src/mage/cards/c/CoralReef.java index 24093ec4c5..e2e5edaa7a 100644 --- a/Mage.Sets/src/mage/cards/c/CoralReef.java +++ b/Mage.Sets/src/mage/cards/c/CoralReef.java @@ -23,7 +23,6 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetControlledPermanent; @@ -39,7 +38,7 @@ public final class CoralReef extends CardImpl { private static final FilterControlledCreaturePermanent untappedBlueCreatureFilter = new FilterControlledCreaturePermanent("an untapped blue creature you control"); static { - islandFilter.add(new SubtypePredicate(SubType.ISLAND)); + islandFilter.add(SubType.ISLAND.getPredicate()); untappedBlueCreatureFilter.add(Predicates.not(TappedPredicate.instance)); untappedBlueCreatureFilter.add(new ColorPredicate(ObjectColor.BLUE)); } diff --git a/Mage.Sets/src/mage/cards/c/CoralhelmCommander.java b/Mage.Sets/src/mage/cards/c/CoralhelmCommander.java index 908287bd19..54545468fd 100644 --- a/Mage.Sets/src/mage/cards/c/CoralhelmCommander.java +++ b/Mage.Sets/src/mage/cards/c/CoralhelmCommander.java @@ -19,7 +19,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -30,7 +29,7 @@ public final class CoralhelmCommander extends LevelerCard { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Merfolk creatures"); static { - filter.add(new SubtypePredicate(SubType.MERFOLK)); + filter.add(SubType.MERFOLK.getPredicate()); } public CoralhelmCommander(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CorpseHarvester.java b/Mage.Sets/src/mage/cards/c/CorpseHarvester.java index 0735a84c4a..561815377d 100644 --- a/Mage.Sets/src/mage/cards/c/CorpseHarvester.java +++ b/Mage.Sets/src/mage/cards/c/CorpseHarvester.java @@ -16,7 +16,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; -import mage.filter.predicate.mageobject.SubtypePredicate; + import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; @@ -80,7 +80,7 @@ class CorpseHarvesterEffect extends OneShotEffect { private void searchCard(Player player, Ability source, Game game, Cards cards, String subtype) { FilterCard filter = new FilterCard(subtype); - filter.add(new SubtypePredicate(SubType.byDescription(subtype))); + filter.add(SubType.byDescription(subtype).getPredicate()); TargetCardInLibrary target = new TargetCardInLibrary(filter); if (player.searchLibrary(target, source, game)) { Card card = player.getLibrary().remove(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/c/Corrupt.java b/Mage.Sets/src/mage/cards/c/Corrupt.java index 062f100673..d447bcfce2 100644 --- a/Mage.Sets/src/mage/cards/c/Corrupt.java +++ b/Mage.Sets/src/mage/cards/c/Corrupt.java @@ -12,7 +12,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -49,7 +48,7 @@ class CorruptEffect extends OneShotEffect { private static final FilterLandPermanent filter = new FilterLandPermanent("Swamps"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/c/CorruptedRoots.java b/Mage.Sets/src/mage/cards/c/CorruptedRoots.java index 017c8a0e5f..a28b21f34a 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptedRoots.java +++ b/Mage.Sets/src/mage/cards/c/CorruptedRoots.java @@ -14,7 +14,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -27,8 +26,8 @@ public final class CorruptedRoots extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.FOREST), - new SubtypePredicate(SubType.PLAINS))); + SubType.FOREST.getPredicate(), + SubType.PLAINS.getPredicate())); } public CorruptedRoots(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CourageousOutrider.java b/Mage.Sets/src/mage/cards/c/CourageousOutrider.java index cf514bdcf9..feddb63ab5 100644 --- a/Mage.Sets/src/mage/cards/c/CourageousOutrider.java +++ b/Mage.Sets/src/mage/cards/c/CourageousOutrider.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class CourageousOutrider extends CardImpl { private static final FilterCard filter = new FilterCard("a Human card"); static { - filter.add(new SubtypePredicate(SubType.HUMAN)); + filter.add(SubType.HUMAN.getPredicate()); } public CourageousOutrider(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CracklingPerimeter.java b/Mage.Sets/src/mage/cards/c/CracklingPerimeter.java index 0c1e9fc08f..722dc6f883 100644 --- a/Mage.Sets/src/mage/cards/c/CracklingPerimeter.java +++ b/Mage.Sets/src/mage/cards/c/CracklingPerimeter.java @@ -13,7 +13,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -26,7 +25,7 @@ public final class CracklingPerimeter extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Gate you control"); static { - filter.add(new SubtypePredicate(SubType.GATE)); + filter.add(SubType.GATE.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/c/Crash.java b/Mage.Sets/src/mage/cards/c/Crash.java index 9620766a4c..425d173625 100644 --- a/Mage.Sets/src/mage/cards/c/Crash.java +++ b/Mage.Sets/src/mage/cards/c/Crash.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; @@ -27,7 +26,7 @@ public final class Crash extends CardImpl { static { effectFilter.add(CardType.ARTIFACT.getPredicate()); - alternativeCostFilter.add(new SubtypePredicate(SubType.MOUNTAIN)); + alternativeCostFilter.add(SubType.MOUNTAIN.getPredicate()); } public Crash(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CrashLanding.java b/Mage.Sets/src/mage/cards/c/CrashLanding.java index a1e17bab0f..357158a56d 100644 --- a/Mage.Sets/src/mage/cards/c/CrashLanding.java +++ b/Mage.Sets/src/mage/cards/c/CrashLanding.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -28,7 +27,7 @@ public final class CrashLanding extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("creature with flying"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); filter2.add(new AbilityPredicate(FlyingAbility.class)); } diff --git a/Mage.Sets/src/mage/cards/c/CrashingTide.java b/Mage.Sets/src/mage/cards/c/CrashingTide.java index dcf4b79a5b..b4e6065b7b 100644 --- a/Mage.Sets/src/mage/cards/c/CrashingTide.java +++ b/Mage.Sets/src/mage/cards/c/CrashingTide.java @@ -16,7 +16,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -30,7 +29,7 @@ public final class CrashingTide extends CardImpl { // Crashing tide has flash as long as you control a Merfolk. FilterControlledPermanent filter = new FilterControlledPermanent(); - filter.add(new SubtypePredicate(SubType.MERFOLK)); + filter.add(SubType.MERFOLK.getPredicate()); this.addAbility(new SimpleStaticAbility(Zone.ALL, new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlashAbility.getInstance(), Duration.WhileOnBattlefield, true), new PermanentsOnTheBattlefieldCondition(filter), diff --git a/Mage.Sets/src/mage/cards/c/CrestedSunmare.java b/Mage.Sets/src/mage/cards/c/CrestedSunmare.java index bdfcd07bb7..04798e5c6c 100644 --- a/Mage.Sets/src/mage/cards/c/CrestedSunmare.java +++ b/Mage.Sets/src/mage/cards/c/CrestedSunmare.java @@ -19,7 +19,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.CrestedSunmareToken; import mage.watchers.common.PlayerGainedLifeWatcher; @@ -32,7 +31,7 @@ public final class CrestedSunmare extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Horses you control"); static { - filter.add(new SubtypePredicate(SubType.HORSE)); + filter.add(SubType.HORSE.getPredicate()); } public CrestedSunmare(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java b/Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java index f7beb76b50..d3536a812e 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -25,7 +24,7 @@ public final class CrimsonMuckwader extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Swamp"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public CrimsonMuckwader(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CrosissCatacombs.java b/Mage.Sets/src/mage/cards/c/CrosissCatacombs.java index 11a432f93c..f23a01d5cb 100644 --- a/Mage.Sets/src/mage/cards/c/CrosissCatacombs.java +++ b/Mage.Sets/src/mage/cards/c/CrosissCatacombs.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import java.util.UUID; @@ -26,7 +25,7 @@ public final class CrosissCatacombs extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("non-Lair land"); static{ - filter.add(Predicates.not(new SubtypePredicate(SubType.LAIR))); + filter.add(Predicates.not(SubType.LAIR.getPredicate())); } public CrosissCatacombs(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CrossroadsConsecrator.java b/Mage.Sets/src/mage/cards/c/CrossroadsConsecrator.java index 91088cacf8..69e1205e2e 100644 --- a/Mage.Sets/src/mage/cards/c/CrossroadsConsecrator.java +++ b/Mage.Sets/src/mage/cards/c/CrossroadsConsecrator.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetAttackingCreature; /** @@ -27,7 +26,7 @@ public final class CrossroadsConsecrator extends CardImpl { private static final FilterAttackingCreature filter = new FilterAttackingCreature("attacking Human"); static { - filter.add(new SubtypePredicate(SubType.HUMAN)); + filter.add(SubType.HUMAN.getPredicate()); } public CrossroadsConsecrator(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CrownOfTheAges.java b/Mage.Sets/src/mage/cards/c/CrownOfTheAges.java index 1fbe8b43e2..5c633fc0b4 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfTheAges.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfTheAges.java @@ -19,7 +19,6 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AttachmentAttachedToCardTypePredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.PermanentIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -36,7 +35,7 @@ public final class CrownOfTheAges extends CardImpl { static { filter.add(new AttachmentAttachedToCardTypePredicate(CardType.CREATURE)); - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); } public CrownOfTheAges(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CrucibleOfFire.java b/Mage.Sets/src/mage/cards/c/CrucibleOfFire.java index c7768f42a1..0905cfe66f 100644 --- a/Mage.Sets/src/mage/cards/c/CrucibleOfFire.java +++ b/Mage.Sets/src/mage/cards/c/CrucibleOfFire.java @@ -8,7 +8,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -20,7 +19,7 @@ public final class CrucibleOfFire extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Dragon creatures"); static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } public CrucibleOfFire(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CruelRevival.java b/Mage.Sets/src/mage/cards/c/CruelRevival.java index 34670b3e90..9e10edc1e0 100644 --- a/Mage.Sets/src/mage/cards/c/CruelRevival.java +++ b/Mage.Sets/src/mage/cards/c/CruelRevival.java @@ -12,7 +12,6 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -30,8 +29,8 @@ public final class CruelRevival extends CardImpl { static { filter.add(CardType.CREATURE.getPredicate()); - filter.add(Predicates.not(new SubtypePredicate(SubType.ZOMBIE))); - filter2.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(Predicates.not(SubType.ZOMBIE.getPredicate())); + filter2.add(SubType.ZOMBIE.getPredicate()); } public CruelRevival(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CrusadingKnight.java b/Mage.Sets/src/mage/cards/c/CrusadingKnight.java index 483dbf0b1a..8cb0d0ca14 100644 --- a/Mage.Sets/src/mage/cards/c/CrusadingKnight.java +++ b/Mage.Sets/src/mage/cards/c/CrusadingKnight.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -23,7 +22,7 @@ public final class CrusadingKnight extends CardImpl { private static final FilterLandPermanent swampFilter = new FilterLandPermanent("Swamp your opponent controls"); static { - swampFilter.add(new SubtypePredicate(SubType.SWAMP)); + swampFilter.add(SubType.SWAMP.getPredicate()); swampFilter.add(new ControllerPredicate(TargetController.OPPONENT)); } diff --git a/Mage.Sets/src/mage/cards/c/CrushUnderfoot.java b/Mage.Sets/src/mage/cards/c/CrushUnderfoot.java index 692f43ca97..920e5a62c7 100644 --- a/Mage.Sets/src/mage/cards/c/CrushUnderfoot.java +++ b/Mage.Sets/src/mage/cards/c/CrushUnderfoot.java @@ -11,7 +11,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -50,7 +49,7 @@ class CrushUnderfootEffect extends OneShotEffect { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Giant you control"); static { - filter.add(new SubtypePredicate(SubType.GIANT)); + filter.add(SubType.GIANT.getPredicate()); } public CrushUnderfootEffect() { diff --git a/Mage.Sets/src/mage/cards/c/CruxOfFate.java b/Mage.Sets/src/mage/cards/c/CruxOfFate.java index ff9fe2802f..bc7038f0ca 100644 --- a/Mage.Sets/src/mage/cards/c/CruxOfFate.java +++ b/Mage.Sets/src/mage/cards/c/CruxOfFate.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -21,7 +20,7 @@ public final class CruxOfFate extends CardImpl { private static final FilterCreaturePermanent filterNonDragon = new FilterCreaturePermanent("non-Dragon creatures"); static { - filterNonDragon.add(Predicates.not(new SubtypePredicate(SubType.DRAGON))); + filterNonDragon.add(Predicates.not(SubType.DRAGON.getPredicate())); } public CruxOfFate(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/Cryoclasm.java b/Mage.Sets/src/mage/cards/c/Cryoclasm.java index 85c800b9de..005213ec54 100644 --- a/Mage.Sets/src/mage/cards/c/Cryoclasm.java +++ b/Mage.Sets/src/mage/cards/c/Cryoclasm.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetLandPermanent; /** @@ -23,7 +22,7 @@ public final class Cryoclasm extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Plains or Island"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.PLAINS), new SubtypePredicate(SubType.ISLAND))); + filter.add(Predicates.or(SubType.PLAINS.getPredicate(), SubType.ISLAND.getPredicate())); } public Cryoclasm(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CryptGhast.java b/Mage.Sets/src/mage/cards/c/CryptGhast.java index 99e75eaaea..686df7a573 100644 --- a/Mage.Sets/src/mage/cards/c/CryptGhast.java +++ b/Mage.Sets/src/mage/cards/c/CryptGhast.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -52,7 +51,7 @@ class CryptGhastTriggeredAbility extends TriggeredManaAbility { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("Swamp"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public CryptGhastTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/c/Cryptbreaker.java b/Mage.Sets/src/mage/cards/c/Cryptbreaker.java index 71255d8709..ca7b565d10 100644 --- a/Mage.Sets/src/mage/cards/c/Cryptbreaker.java +++ b/Mage.Sets/src/mage/cards/c/Cryptbreaker.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.permanent.token.ZombieToken; import mage.target.common.TargetControlledCreaturePermanent; @@ -34,7 +33,7 @@ public final class Cryptbreaker extends CardImpl { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public Cryptbreaker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CrypticGateway.java b/Mage.Sets/src/mage/cards/c/CrypticGateway.java index ea840305cf..de3c4d4ac7 100644 --- a/Mage.Sets/src/mage/cards/c/CrypticGateway.java +++ b/Mage.Sets/src/mage/cards/c/CrypticGateway.java @@ -19,11 +19,9 @@ import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.players.Player; import mage.target.common.TargetControlledPermanent; import java.util.ArrayList; @@ -173,18 +171,18 @@ class CrypticGatewayEffect extends OneShotEffect { changeling2 = true; } - List subtypes = new ArrayList<>(); + List subtypes = new ArrayList<>(); for (SubType subtype : creature.getSubtype(game)) { if (creature2.hasSubtype(subtype, game) || changeling2) { - subtypes.add(new SubtypePredicate(subtype)); + subtypes.add(subtype.getPredicate()); commonSubType = true; } } for (SubType subtype : creature2.getSubtype(game)) { if (creature.hasSubtype(subtype, game) || changeling) { - subtypes.add(new SubtypePredicate(subtype)); + subtypes.add(subtype.getPredicate()); commonSubType = true; } } diff --git a/Mage.Sets/src/mage/cards/c/CultOfTheWaxingMoon.java b/Mage.Sets/src/mage/cards/c/CultOfTheWaxingMoon.java index da9dab039a..303a57bdae 100644 --- a/Mage.Sets/src/mage/cards/c/CultOfTheWaxingMoon.java +++ b/Mage.Sets/src/mage/cards/c/CultOfTheWaxingMoon.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -50,7 +49,7 @@ class CultOfTheWaxingMoonAbility extends TriggeredAbilityImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.HUMAN))); + filter.add(Predicates.not(SubType.HUMAN.getPredicate())); } public CultOfTheWaxingMoonAbility() { diff --git a/Mage.Sets/src/mage/cards/c/CurseOfMaritLage.java b/Mage.Sets/src/mage/cards/c/CurseOfMaritLage.java index 08ca4211fc..e49f20a4ad 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfMaritLage.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfMaritLage.java @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -21,7 +20,7 @@ public final class CurseOfMaritLage extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Islands"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } public CurseOfMaritLage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CurseOfMisfortunes.java b/Mage.Sets/src/mage/cards/c/CurseOfMisfortunes.java index 1fa8220d2f..e62b6a30cf 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfMisfortunes.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfMisfortunes.java @@ -16,7 +16,6 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -78,7 +77,7 @@ class CurseOfMisfortunesEffect extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); if (player != null && targetPlayer != null) { FilterCard filter = new FilterCard("Curse card that doesn't have the same name as a Curse attached to enchanted player"); - filter.add(new SubtypePredicate(SubType.CURSE)); + filter.add(SubType.CURSE.getPredicate()); // get the names of attached Curses for (UUID attachmentId: targetPlayer.getAttachments()) { Permanent attachment = game.getPermanent(attachmentId); diff --git a/Mage.Sets/src/mage/cards/c/CutTheTethers.java b/Mage.Sets/src/mage/cards/c/CutTheTethers.java index 5275987581..01b36616d0 100644 --- a/Mage.Sets/src/mage/cards/c/CutTheTethers.java +++ b/Mage.Sets/src/mage/cards/c/CutTheTethers.java @@ -10,7 +10,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -46,7 +45,7 @@ class CutTheTethersEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Spirit creatures"); static { - filter.add(new SubtypePredicate(SubType.SPIRIT)); + filter.add(SubType.SPIRIT.getPredicate()); } public CutTheTethersEffect() { diff --git a/Mage.Sets/src/mage/cards/c/CyclopeanTomb.java b/Mage.Sets/src/mage/cards/c/CyclopeanTomb.java index 66d2a6f2ca..95643caea0 100644 --- a/Mage.Sets/src/mage/cards/c/CyclopeanTomb.java +++ b/Mage.Sets/src/mage/cards/c/CyclopeanTomb.java @@ -20,7 +20,6 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.PermanentIdPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -40,7 +39,7 @@ public final class CyclopeanTomb extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.SWAMP))); + filter.add(Predicates.not(SubType.SWAMP.getPredicate())); } public CyclopeanTomb(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DakmorSorceress.java b/Mage.Sets/src/mage/cards/d/DakmorSorceress.java index f37179257c..f78a79568d 100644 --- a/Mage.Sets/src/mage/cards/d/DakmorSorceress.java +++ b/Mage.Sets/src/mage/cards/d/DakmorSorceress.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class DakmorSorceress extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Swamps you control"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public DakmorSorceress(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DanceOfTheManse.java b/Mage.Sets/src/mage/cards/d/DanceOfTheManse.java index b3d90d1e4c..195f129459 100644 --- a/Mage.Sets/src/mage/cards/d/DanceOfTheManse.java +++ b/Mage.Sets/src/mage/cards/d/DanceOfTheManse.java @@ -13,7 +13,6 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.Target; @@ -61,7 +60,7 @@ enum DanceOfTheManseAdjuster implements TargetAdjuster { CardType.ARTIFACT.getPredicate(), Predicates.and( CardType.ENCHANTMENT.getPredicate(), - Predicates.not(new SubtypePredicate(SubType.AURA)) + Predicates.not(SubType.AURA.getPredicate()) ) )); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, xValue + 1)); diff --git a/Mage.Sets/src/mage/cards/d/DanithaCapashenParagon.java b/Mage.Sets/src/mage/cards/d/DanithaCapashenParagon.java index 918ebb285d..49a8f74f94 100644 --- a/Mage.Sets/src/mage/cards/d/DanithaCapashenParagon.java +++ b/Mage.Sets/src/mage/cards/d/DanithaCapashenParagon.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -28,8 +27,8 @@ public final class DanithaCapashenParagon extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.AURA), - new SubtypePredicate(SubType.EQUIPMENT))); + SubType.AURA.getPredicate(), + SubType.EQUIPMENT.getPredicate())); } public DanithaCapashenParagon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DarigaazsCaldera.java b/Mage.Sets/src/mage/cards/d/DarigaazsCaldera.java index 6aca2bd2e3..7a551fbf7c 100644 --- a/Mage.Sets/src/mage/cards/d/DarigaazsCaldera.java +++ b/Mage.Sets/src/mage/cards/d/DarigaazsCaldera.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import java.util.UUID; @@ -26,7 +25,7 @@ public final class DarigaazsCaldera extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("non-Lair land"); static{ - filter.add(Predicates.not(new SubtypePredicate(SubType.LAIR))); + filter.add(Predicates.not(SubType.LAIR.getPredicate())); } public DarigaazsCaldera(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DaringBuccaneer.java b/Mage.Sets/src/mage/cards/d/DaringBuccaneer.java index d0f2a548c7..660a5e52e5 100644 --- a/Mage.Sets/src/mage/cards/d/DaringBuccaneer.java +++ b/Mage.Sets/src/mage/cards/d/DaringBuccaneer.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; /** @@ -22,7 +21,7 @@ public final class DaringBuccaneer extends CardImpl { private static final FilterCard filter = new FilterCard("a Pirate card from your hand"); static { - filter.add(new SubtypePredicate(SubType.PIRATE)); + filter.add(SubType.PIRATE.getPredicate()); } public DaringBuccaneer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DaringDemolition.java b/Mage.Sets/src/mage/cards/d/DaringDemolition.java index 961160bbb5..a77efb20ae 100644 --- a/Mage.Sets/src/mage/cards/d/DaringDemolition.java +++ b/Mage.Sets/src/mage/cards/d/DaringDemolition.java @@ -9,7 +9,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -21,7 +20,7 @@ public final class DaringDemolition extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("creature or Vehicle"); static { - filter.add(Predicates.or(CardType.CREATURE.getPredicate(), new SubtypePredicate(SubType.VEHICLE))); + filter.add(Predicates.or(CardType.CREATURE.getPredicate(), SubType.VEHICLE.getPredicate())); } public DaringDemolition(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DarkHeartOfTheWood.java b/Mage.Sets/src/mage/cards/d/DarkHeartOfTheWood.java index 1445bf892e..3bc67c0ec2 100644 --- a/Mage.Sets/src/mage/cards/d/DarkHeartOfTheWood.java +++ b/Mage.Sets/src/mage/cards/d/DarkHeartOfTheWood.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -23,7 +22,7 @@ public final class DarkHeartOfTheWood extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Forest"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public DarkHeartOfTheWood(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DarkIntimations.java b/Mage.Sets/src/mage/cards/d/DarkIntimations.java index 1e07ff2733..140fa554e1 100644 --- a/Mage.Sets/src/mage/cards/d/DarkIntimations.java +++ b/Mage.Sets/src/mage/cards/d/DarkIntimations.java @@ -18,7 +18,6 @@ import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.EntersTheBattlefieldEvent; @@ -40,7 +39,7 @@ public final class DarkIntimations extends CardImpl { static { filter.add(CardType.PLANESWALKER.getPredicate()); - filter.add(new SubtypePredicate(SubType.BOLAS)); + filter.add(SubType.BOLAS.getPredicate()); } public DarkIntimations(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DarkSalvation.java b/Mage.Sets/src/mage/cards/d/DarkSalvation.java index ca82c4e59e..f2e07f3fd1 100644 --- a/Mage.Sets/src/mage/cards/d/DarkSalvation.java +++ b/Mage.Sets/src/mage/cards/d/DarkSalvation.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.token.ZombieToken; import mage.players.Player; @@ -61,7 +60,7 @@ class ZombiesControlledByTargetPlayerCount implements DynamicValue { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Zombies"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } @Override diff --git a/Mage.Sets/src/mage/cards/d/DarkSupplicant.java b/Mage.Sets/src/mage/cards/d/DarkSupplicant.java index 387bc27557..897598bfe0 100644 --- a/Mage.Sets/src/mage/cards/d/DarkSupplicant.java +++ b/Mage.Sets/src/mage/cards/d/DarkSupplicant.java @@ -18,7 +18,6 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInHand; @@ -35,7 +34,7 @@ public final class DarkSupplicant extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("three Clerics you control"); static { - filter.add(new SubtypePredicate(SubType.CLERIC)); + filter.add(SubType.CLERIC.getPredicate()); } public DarkSupplicant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DaruEncampment.java b/Mage.Sets/src/mage/cards/d/DaruEncampment.java index 85c540518c..190ba0d01f 100644 --- a/Mage.Sets/src/mage/cards/d/DaruEncampment.java +++ b/Mage.Sets/src/mage/cards/d/DaruEncampment.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -26,7 +25,7 @@ public final class DaruEncampment extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Soldier creature"); static { - filter.add(new SubtypePredicate(SubType.SOLDIER)); + filter.add(SubType.SOLDIER.getPredicate()); } public DaruEncampment(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DaruWarchief.java b/Mage.Sets/src/mage/cards/d/DaruWarchief.java index d08f88722a..211b0173aa 100644 --- a/Mage.Sets/src/mage/cards/d/DaruWarchief.java +++ b/Mage.Sets/src/mage/cards/d/DaruWarchief.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,8 +25,8 @@ public final class DaruWarchief extends CardImpl { private static final FilterCreaturePermanent filterCreatures = new FilterCreaturePermanent("Soldier creatures"); static { - filter.add(new SubtypePredicate(SubType.SOLDIER)); - filterCreatures.add(new SubtypePredicate(SubType.SOLDIER)); + filter.add(SubType.SOLDIER.getPredicate()); + filterCreatures.add(SubType.SOLDIER.getPredicate()); } public DaruWarchief(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java b/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java index 2f82085d8c..8ddc4d527c 100644 --- a/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java +++ b/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java @@ -19,7 +19,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -33,9 +32,9 @@ public final class DauntlessDourbark extends CardImpl { static final private FilterControlledPermanent filter2 = new FilterControlledPermanent(); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.FOREST), - new SubtypePredicate(SubType.TREEFOLK))); - filter2.add(new SubtypePredicate(SubType.TREEFOLK)); + filter.add(Predicates.or(SubType.FOREST.getPredicate(), + SubType.TREEFOLK.getPredicate())); + filter2.add(SubType.TREEFOLK.getPredicate()); filter2.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java b/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java index 343f3aca8d..f098570003 100644 --- a/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java +++ b/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -27,7 +26,7 @@ public final class DauntlessRiverMarshal extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("an Island"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/d/DayOfTheDragons.java b/Mage.Sets/src/mage/cards/d/DayOfTheDragons.java index d33d7e3271..f9e3ecd495 100644 --- a/Mage.Sets/src/mage/cards/d/DayOfTheDragons.java +++ b/Mage.Sets/src/mage/cards/d/DayOfTheDragons.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.ExileZone; import mage.game.Game; @@ -98,7 +97,7 @@ class DayOfTheDragonsLeavesEffect extends OneShotEffect { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } public DayOfTheDragonsLeavesEffect() { diff --git a/Mage.Sets/src/mage/cards/d/Daze.java b/Mage.Sets/src/mage/cards/d/Daze.java index 6b9ac8291a..7ed0c5bd3f 100644 --- a/Mage.Sets/src/mage/cards/d/Daze.java +++ b/Mage.Sets/src/mage/cards/d/Daze.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetSpell; import mage.target.common.TargetControlledPermanent; @@ -24,7 +23,7 @@ public final class Daze extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("an Island"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); filter.add(CardType.LAND.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/d/Deadapult.java b/Mage.Sets/src/mage/cards/d/Deadapult.java index 52a32cbbae..5d35135ce2 100644 --- a/Mage.Sets/src/mage/cards/d/Deadapult.java +++ b/Mage.Sets/src/mage/cards/d/Deadapult.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetAnyTarget; @@ -27,7 +26,7 @@ public final class Deadapult extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a Zombie"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public Deadapult(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DeadeyeQuartermaster.java b/Mage.Sets/src/mage/cards/d/DeadeyeQuartermaster.java index 14ed3fbdce..3768fa281c 100644 --- a/Mage.Sets/src/mage/cards/d/DeadeyeQuartermaster.java +++ b/Mage.Sets/src/mage/cards/d/DeadeyeQuartermaster.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -24,8 +23,8 @@ public final class DeadeyeQuartermaster extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.EQUIPMENT), - new SubtypePredicate(SubType.VEHICLE) + SubType.EQUIPMENT.getPredicate(), + SubType.VEHICLE.getPredicate() )); } diff --git a/Mage.Sets/src/mage/cards/d/DeathBaron.java b/Mage.Sets/src/mage/cards/d/DeathBaron.java index 1518f85652..90c0d4c2f0 100644 --- a/Mage.Sets/src/mage/cards/d/DeathBaron.java +++ b/Mage.Sets/src/mage/cards/d/DeathBaron.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -26,9 +25,9 @@ public final class DeathBaron extends CardImpl { private static final FilterCreaturePermanent filterZombie = new FilterCreaturePermanent(); static { - filterSkeletons.add(new SubtypePredicate(SubType.SKELETON)); - filterZombie.add(new SubtypePredicate(SubType.ZOMBIE)); - filterZombie.add(Predicates.not(new SubtypePredicate(SubType.SKELETON))); + filterSkeletons.add(SubType.SKELETON.getPredicate()); + filterZombie.add(SubType.ZOMBIE.getPredicate()); + filterZombie.add(Predicates.not(SubType.SKELETON.getPredicate())); } public DeathBaron(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DeathTrooper.java b/Mage.Sets/src/mage/cards/d/DeathTrooper.java index 2075886903..703e51535a 100644 --- a/Mage.Sets/src/mage/cards/d/DeathTrooper.java +++ b/Mage.Sets/src/mage/cards/d/DeathTrooper.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class DeathTrooper extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Trooper creatures"); static { - filter.add(new SubtypePredicate(SubType.TROOPER)); + filter.add(SubType.TROOPER.getPredicate()); } public DeathTrooper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DeathbellowWarCry.java b/Mage.Sets/src/mage/cards/d/DeathbellowWarCry.java index fddedf90f3..911186f034 100644 --- a/Mage.Sets/src/mage/cards/d/DeathbellowWarCry.java +++ b/Mage.Sets/src/mage/cards/d/DeathbellowWarCry.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.target.common.TargetCardInLibrary; @@ -44,7 +43,7 @@ class DeathbellowWarCryTarget extends TargetCardInLibrary { = new FilterCreatureCard("Minotaur creature cards with different names"); static { - minotaurFilter.add(new SubtypePredicate(SubType.MINOTAUR)); + minotaurFilter.add(SubType.MINOTAUR.getPredicate()); } DeathbellowWarCryTarget() { diff --git a/Mage.Sets/src/mage/cards/d/DeathlessAncient.java b/Mage.Sets/src/mage/cards/d/DeathlessAncient.java index 6719a9fafa..dd353c89a6 100644 --- a/Mage.Sets/src/mage/cards/d/DeathlessAncient.java +++ b/Mage.Sets/src/mage/cards/d/DeathlessAncient.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -28,7 +27,7 @@ public final class DeathlessAncient extends CardImpl { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); } public DeathlessAncient(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DeathlessBehemoth.java b/Mage.Sets/src/mage/cards/d/DeathlessBehemoth.java index 0cce899f7e..892b57bf8b 100644 --- a/Mage.Sets/src/mage/cards/d/DeathlessBehemoth.java +++ b/Mage.Sets/src/mage/cards/d/DeathlessBehemoth.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -27,8 +26,8 @@ public final class DeathlessBehemoth extends CardImpl { static { filter.add(Predicates.and( - new SubtypePredicate(SubType.ELDRAZI), - new SubtypePredicate(SubType.SCION))); + SubType.ELDRAZI.getPredicate(), + SubType.SCION.getPredicate())); } public DeathlessBehemoth(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DeathmarkPrelate.java b/Mage.Sets/src/mage/cards/d/DeathmarkPrelate.java index 67db4dac5e..46ac1c0f04 100644 --- a/Mage.Sets/src/mage/cards/d/DeathmarkPrelate.java +++ b/Mage.Sets/src/mage/cards/d/DeathmarkPrelate.java @@ -17,7 +17,6 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -31,8 +30,8 @@ public final class DeathmarkPrelate extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("non-Zombie creature"); static { - filter1.add(new SubtypePredicate(SubType.ZOMBIE)); - filter2.add(Predicates.not(new SubtypePredicate(SubType.ZOMBIE))); + filter1.add(SubType.ZOMBIE.getPredicate()); + filter2.add(Predicates.not(SubType.ZOMBIE.getPredicate())); } public DeathmarkPrelate(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DeathsporeThallid.java b/Mage.Sets/src/mage/cards/d/DeathsporeThallid.java index 7a2f0a7e9b..9b622ad193 100644 --- a/Mage.Sets/src/mage/cards/d/DeathsporeThallid.java +++ b/Mage.Sets/src/mage/cards/d/DeathsporeThallid.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SaprolingToken; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -29,7 +28,7 @@ public final class DeathsporeThallid extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Saproling"); static { - filter.add(new SubtypePredicate(SubType.SAPROLING)); + filter.add(SubType.SAPROLING.getPredicate()); } public DeathsporeThallid(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DeeprootWaters.java b/Mage.Sets/src/mage/cards/d/DeeprootWaters.java index d08a5a85fc..e7dae2f169 100644 --- a/Mage.Sets/src/mage/cards/d/DeeprootWaters.java +++ b/Mage.Sets/src/mage/cards/d/DeeprootWaters.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.MerfolkHexproofToken; /** @@ -21,7 +20,7 @@ public final class DeeprootWaters extends CardImpl { private static final FilterSpell filter = new FilterSpell("a Merfolk spell"); static { - filter.add(new SubtypePredicate(SubType.MERFOLK)); + filter.add(SubType.MERFOLK.getPredicate()); } public DeeprootWaters(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DeepwoodLegate.java b/Mage.Sets/src/mage/cards/d/DeepwoodLegate.java index d0dcb0ca4b..ed10d5ef1b 100644 --- a/Mage.Sets/src/mage/cards/d/DeepwoodLegate.java +++ b/Mage.Sets/src/mage/cards/d/DeepwoodLegate.java @@ -18,7 +18,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -30,8 +29,8 @@ public final class DeepwoodLegate extends CardImpl { private static final FilterPermanent filterSwamp = new FilterPermanent(); static { - filterForest.add(new SubtypePredicate(SubType.FOREST)); - filterSwamp.add(new SubtypePredicate(SubType.SWAMP)); + filterForest.add(SubType.FOREST.getPredicate()); + filterSwamp.add(SubType.SWAMP.getPredicate()); } public DeepwoodLegate(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DefensiveManeuvers.java b/Mage.Sets/src/mage/cards/d/DefensiveManeuvers.java index 755fe98290..fdb2ef7876 100644 --- a/Mage.Sets/src/mage/cards/d/DefensiveManeuvers.java +++ b/Mage.Sets/src/mage/cards/d/DefensiveManeuvers.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; @@ -73,7 +72,7 @@ class DefensiveManeuversEffect extends OneShotEffect { return false; } FilterCreaturePermanent filter = new FilterCreaturePermanent(); - filter.add(new SubtypePredicate(subType)); + filter.add(subType.getPredicate()); game.addEffect(new BoostAllEffect(0, 4, Duration.EndOfTurn, filter, false), source); return true; } diff --git a/Mage.Sets/src/mage/cards/d/DefiantFalcon.java b/Mage.Sets/src/mage/cards/d/DefiantFalcon.java index 1ce7706f50..2ca35ee4dd 100644 --- a/Mage.Sets/src/mage/cards/d/DefiantFalcon.java +++ b/Mage.Sets/src/mage/cards/d/DefiantFalcon.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -28,7 +27,7 @@ public final class DefiantFalcon extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with converted mana cost 3 or less"); static { - filter.add(new SubtypePredicate(SubType.REBEL)); + filter.add(SubType.REBEL.getPredicate()); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); } diff --git a/Mage.Sets/src/mage/cards/d/DefiantVanguard.java b/Mage.Sets/src/mage/cards/d/DefiantVanguard.java index c65af7ad56..b6366edcc6 100644 --- a/Mage.Sets/src/mage/cards/d/DefiantVanguard.java +++ b/Mage.Sets/src/mage/cards/d/DefiantVanguard.java @@ -23,7 +23,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -40,7 +39,7 @@ public final class DefiantVanguard extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with converted mana cost 4 or less"); static { - filter.add(new SubtypePredicate(SubType.REBEL)); + filter.add(SubType.REBEL.getPredicate()); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 5)); } diff --git a/Mage.Sets/src/mage/cards/d/Defile.java b/Mage.Sets/src/mage/cards/d/Defile.java index 3bda95ddfd..77faa53931 100644 --- a/Mage.Sets/src/mage/cards/d/Defile.java +++ b/Mage.Sets/src/mage/cards/d/Defile.java @@ -10,7 +10,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -23,7 +22,7 @@ public final class Defile extends CardImpl { private static final FilterPermanent filter = new FilterControlledPermanent(); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } private static final DynamicValue xValue = new PermanentsOnBattlefieldCount(filter, -1); diff --git a/Mage.Sets/src/mage/cards/d/DementiaSliver.java b/Mage.Sets/src/mage/cards/d/DementiaSliver.java index 40719b4412..904b2503fb 100644 --- a/Mage.Sets/src/mage/cards/d/DementiaSliver.java +++ b/Mage.Sets/src/mage/cards/d/DementiaSliver.java @@ -13,7 +13,6 @@ import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.cards.*; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; @@ -29,7 +28,7 @@ public final class DementiaSliver extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("All Slivers"); static { - filter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); } public DementiaSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DepalaPilotExemplar.java b/Mage.Sets/src/mage/cards/d/DepalaPilotExemplar.java index 0d0755ed78..acdc3e5750 100644 --- a/Mage.Sets/src/mage/cards/d/DepalaPilotExemplar.java +++ b/Mage.Sets/src/mage/cards/d/DepalaPilotExemplar.java @@ -20,7 +20,6 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; @@ -65,7 +64,7 @@ class DepalaPilotExemplarEffect extends OneShotEffect { private static final FilterCard filter = new FilterCard("Dwarf and Vehicle cards"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.DWARF), new SubtypePredicate(SubType.VEHICLE))); + filter.add(Predicates.or(SubType.DWARF.getPredicate(), SubType.VEHICLE.getPredicate())); } DepalaPilotExemplarEffect() { diff --git a/Mage.Sets/src/mage/cards/d/DepartedDeckhand.java b/Mage.Sets/src/mage/cards/d/DepartedDeckhand.java index b8a94e3620..d6b37eed1c 100644 --- a/Mage.Sets/src/mage/cards/d/DepartedDeckhand.java +++ b/Mage.Sets/src/mage/cards/d/DepartedDeckhand.java @@ -18,7 +18,6 @@ import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.MageInt; @@ -31,7 +30,7 @@ public final class DepartedDeckhand extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.SPIRIT))); + filter.add(Predicates.not(SubType.SPIRIT.getPredicate())); } public DepartedDeckhand(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DerangedHermit.java b/Mage.Sets/src/mage/cards/d/DerangedHermit.java index 777b94f672..365316654a 100644 --- a/Mage.Sets/src/mage/cards/d/DerangedHermit.java +++ b/Mage.Sets/src/mage/cards/d/DerangedHermit.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SquirrelToken; /** @@ -27,7 +26,7 @@ public final class DerangedHermit extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Squirrel creatures"); static { - filter.add(new SubtypePredicate(SubType.SQUIRREL)); + filter.add(SubType.SQUIRREL.getPredicate()); } public DerangedHermit(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DerangedOutcast.java b/Mage.Sets/src/mage/cards/d/DerangedOutcast.java index 853b9e1abe..d77f59fd10 100644 --- a/Mage.Sets/src/mage/cards/d/DerangedOutcast.java +++ b/Mage.Sets/src/mage/cards/d/DerangedOutcast.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -27,7 +26,7 @@ public final class DerangedOutcast extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Human"); static { - filter.add(new SubtypePredicate(SubType.HUMAN)); + filter.add(SubType.HUMAN.getPredicate()); } public DerangedOutcast(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DesertNomads.java b/Mage.Sets/src/mage/cards/d/DesertNomads.java index 88b0b5d010..f3143a88c2 100644 --- a/Mage.Sets/src/mage/cards/d/DesertNomads.java +++ b/Mage.Sets/src/mage/cards/d/DesertNomads.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -28,7 +27,7 @@ public final class DesertNomads extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("desert"); static { - filter.add(new SubtypePredicate(SubType.DESERT)); + filter.add(SubType.DESERT.getPredicate()); } public DesertNomads(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DesertsHold.java b/Mage.Sets/src/mage/cards/d/DesertsHold.java index eca577bfd7..37eca1b6db 100644 --- a/Mage.Sets/src/mage/cards/d/DesertsHold.java +++ b/Mage.Sets/src/mage/cards/d/DesertsHold.java @@ -21,7 +21,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -34,8 +33,8 @@ public final class DesertsHold extends CardImpl { private static final FilterControlledPermanent filterDesertPermanent = new FilterControlledPermanent("Desert"); private static final FilterCard filterDesertCard = new FilterCard("Desert card"); static { - filterDesertPermanent.add(new SubtypePredicate(SubType.DESERT)); - filterDesertCard.add(new SubtypePredicate(SubType.DESERT)); + filterDesertPermanent.add(SubType.DESERT.getPredicate()); + filterDesertCard.add(SubType.DESERT.getPredicate()); } public DesertsHold(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DesiccatedNaga.java b/Mage.Sets/src/mage/cards/d/DesiccatedNaga.java index 89671ffe4e..a9fbe8b25f 100644 --- a/Mage.Sets/src/mage/cards/d/DesiccatedNaga.java +++ b/Mage.Sets/src/mage/cards/d/DesiccatedNaga.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPlaneswalkerPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetOpponent; import java.util.UUID; @@ -29,7 +28,7 @@ public final class DesiccatedNaga extends CardImpl { private static final FilterPlaneswalkerPermanent filter = new FilterPlaneswalkerPermanent("you control a Liliana planeswalker"); static { - filter.add(new SubtypePredicate(SubType.LILIANA)); + filter.add(SubType.LILIANA.getPredicate()); } public DesiccatedNaga(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/Desolation.java b/Mage.Sets/src/mage/cards/d/Desolation.java index 75e0f0dbb7..5b386ab5af 100644 --- a/Mage.Sets/src/mage/cards/d/Desolation.java +++ b/Mage.Sets/src/mage/cards/d/Desolation.java @@ -16,7 +16,6 @@ import mage.constants.TargetController; import mage.constants.WatcherScope; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -54,7 +53,7 @@ class DesolationEffect extends OneShotEffect { private static final FilterPermanent filterPlains = new FilterPermanent(); static { - filterPlains.add(new SubtypePredicate(SubType.PLAINS)); + filterPlains.add(SubType.PLAINS.getPredicate()); } public DesolationEffect() { diff --git a/Mage.Sets/src/mage/cards/d/DevouringGreed.java b/Mage.Sets/src/mage/cards/d/DevouringGreed.java index 69b321c21a..fe89bdca48 100644 --- a/Mage.Sets/src/mage/cards/d/DevouringGreed.java +++ b/Mage.Sets/src/mage/cards/d/DevouringGreed.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; @@ -27,7 +26,7 @@ public final class DevouringGreed extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("any number of Spirits"); static { - filter.add(new SubtypePredicate(SubType.SPIRIT)); + filter.add(SubType.SPIRIT.getPredicate()); } public DevouringGreed(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DevouringRage.java b/Mage.Sets/src/mage/cards/d/DevouringRage.java index aba4f17cbc..d8289f1fe6 100644 --- a/Mage.Sets/src/mage/cards/d/DevouringRage.java +++ b/Mage.Sets/src/mage/cards/d/DevouringRage.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; @@ -31,7 +30,7 @@ public final class DevouringRage extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("any number of Spirits"); static { - filter.add(new SubtypePredicate(SubType.SPIRIT)); + filter.add(SubType.SPIRIT.getPredicate()); } public DevouringRage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DevoutChaplain.java b/Mage.Sets/src/mage/cards/d/DevoutChaplain.java index 02b3d391f4..ff8ac44a8c 100644 --- a/Mage.Sets/src/mage/cards/d/DevoutChaplain.java +++ b/Mage.Sets/src/mage/cards/d/DevoutChaplain.java @@ -15,7 +15,6 @@ import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; @@ -31,7 +30,7 @@ public final class DevoutChaplain extends CardImpl { static { humanFilter.add(Predicates.not(TappedPredicate.instance)); - humanFilter.add(new SubtypePredicate(SubType.HUMAN)); + humanFilter.add(SubType.HUMAN.getPredicate()); } public DevoutChaplain(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DevoutHarpist.java b/Mage.Sets/src/mage/cards/d/DevoutHarpist.java index 9bb9e1b667..4962385d0d 100644 --- a/Mage.Sets/src/mage/cards/d/DevoutHarpist.java +++ b/Mage.Sets/src/mage/cards/d/DevoutHarpist.java @@ -15,7 +15,6 @@ import mage.constants.Zone; import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.predicate.ObjectPlayer; import mage.filter.predicate.ObjectPlayerPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -28,7 +27,7 @@ public final class DevoutHarpist extends CardImpl { private static final FilterEnchantmentPermanent filter = new FilterEnchantmentPermanent("Aura attached to a creature"); static { - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); filter.add(new DevoutHarpistPredicate()); } public DevoutHarpist(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DiamondKaleidoscope.java b/Mage.Sets/src/mage/cards/d/DiamondKaleidoscope.java index b34727c950..fd21f23373 100644 --- a/Mage.Sets/src/mage/cards/d/DiamondKaleidoscope.java +++ b/Mage.Sets/src/mage/cards/d/DiamondKaleidoscope.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.PrismToken; import mage.target.common.TargetControlledPermanent; @@ -30,7 +29,7 @@ public final class DiamondKaleidoscope extends CardImpl { static { filter.add(TokenPredicate.instance); - filter.add(new SubtypePredicate(SubType.PRISM)); + filter.add(SubType.PRISM.getPredicate()); } public DiamondKaleidoscope(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/Didgeridoo.java b/Mage.Sets/src/mage/cards/d/Didgeridoo.java index 3067316353..47f6c75792 100644 --- a/Mage.Sets/src/mage/cards/d/Didgeridoo.java +++ b/Mage.Sets/src/mage/cards/d/Didgeridoo.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class Didgeridoo extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("a Minotaur permanent card"); static { - filter.add(new SubtypePredicate(SubType.MINOTAUR)); + filter.add(SubType.MINOTAUR.getPredicate()); } public Didgeridoo(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DinosaurStampede.java b/Mage.Sets/src/mage/cards/d/DinosaurStampede.java index a021128264..7bb97493c6 100644 --- a/Mage.Sets/src/mage/cards/d/DinosaurStampede.java +++ b/Mage.Sets/src/mage/cards/d/DinosaurStampede.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterAttackingCreature; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -27,7 +26,7 @@ public final class DinosaurStampede extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("Dinosaurs you control"); static { - filter2.add(new SubtypePredicate(SubType.DINOSAUR)); + filter2.add(SubType.DINOSAUR.getPredicate()); filter2.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/d/DireFleetCaptain.java b/Mage.Sets/src/mage/cards/d/DireFleetCaptain.java index 45e32a2b7d..742b551031 100644 --- a/Mage.Sets/src/mage/cards/d/DireFleetCaptain.java +++ b/Mage.Sets/src/mage/cards/d/DireFleetCaptain.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -24,7 +23,7 @@ public final class DireFleetCaptain extends CardImpl { private static final FilterAttackingCreature filter = new FilterAttackingCreature("other attacking Pirate"); static { - filter.add(new SubtypePredicate(SubType.PIRATE)); + filter.add(SubType.PIRATE.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/d/DireFleetNeckbreaker.java b/Mage.Sets/src/mage/cards/d/DireFleetNeckbreaker.java index ac04adbc8b..728769f037 100644 --- a/Mage.Sets/src/mage/cards/d/DireFleetNeckbreaker.java +++ b/Mage.Sets/src/mage/cards/d/DireFleetNeckbreaker.java @@ -10,7 +10,6 @@ import mage.constants.*; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -22,7 +21,7 @@ public final class DireFleetNeckbreaker extends CardImpl { private static final FilterAttackingCreature filterYourAttackingPirates = new FilterAttackingCreature("Attacking Pirates"); static { filterYourAttackingPirates.add(new ControllerPredicate(TargetController.YOU)); - filterYourAttackingPirates.add(new SubtypePredicate(SubType.PIRATE)); + filterYourAttackingPirates.add(SubType.PIRATE.getPredicate()); } public DireFleetNeckbreaker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DireWolves.java b/Mage.Sets/src/mage/cards/d/DireWolves.java index 686577259d..879c8d78e2 100644 --- a/Mage.Sets/src/mage/cards/d/DireWolves.java +++ b/Mage.Sets/src/mage/cards/d/DireWolves.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class DireWolves extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("a Plains"); static { - filter.add(new SubtypePredicate(SubType.PLAINS)); + filter.add(SubType.PLAINS.getPredicate()); } public DireWolves(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DiregrafCaptain.java b/Mage.Sets/src/mage/cards/d/DiregrafCaptain.java index 7417c633a4..845221f6d8 100644 --- a/Mage.Sets/src/mage/cards/d/DiregrafCaptain.java +++ b/Mage.Sets/src/mage/cards/d/DiregrafCaptain.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -32,7 +31,7 @@ public final class DiregrafCaptain extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Zombie"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public DiregrafCaptain(UUID ownerId, CardSetInfo setInfo) { @@ -65,7 +64,7 @@ class DiregrafCaptainTriggeredAbility extends TriggeredAbilityImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Zombie"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public DiregrafCaptainTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/d/DiregrafColossus.java b/Mage.Sets/src/mage/cards/d/DiregrafColossus.java index 268136511b..ba5302ea20 100644 --- a/Mage.Sets/src/mage/cards/d/DiregrafColossus.java +++ b/Mage.Sets/src/mage/cards/d/DiregrafColossus.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.FilterCard; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.ZombieToken; @@ -31,7 +30,7 @@ public final class DiregrafColossus extends CardImpl { private static final FilterSpell filter = new FilterSpell("a Zombie spell"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public DiregrafColossus(UUID ownerId, CardSetInfo setInfo) { @@ -64,7 +63,7 @@ class DiregrafColossusEffect extends OneShotEffect { private static final FilterCard filter = new FilterCard(); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public DiregrafColossusEffect() { diff --git a/Mage.Sets/src/mage/cards/d/DiregrafEscort.java b/Mage.Sets/src/mage/cards/d/DiregrafEscort.java index fe425a3cb5..6102c0b610 100644 --- a/Mage.Sets/src/mage/cards/d/DiregrafEscort.java +++ b/Mage.Sets/src/mage/cards/d/DiregrafEscort.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @author noxx @@ -26,7 +25,7 @@ public final class DiregrafEscort extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("Zombies"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public DiregrafEscort(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/Disarm.java b/Mage.Sets/src/mage/cards/d/Disarm.java index ffa60e0ee3..fb7703d919 100644 --- a/Mage.Sets/src/mage/cards/d/Disarm.java +++ b/Mage.Sets/src/mage/cards/d/Disarm.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AttachedToPredicate; import mage.filter.predicate.permanent.PermanentIdPredicate; import mage.game.Game; @@ -65,7 +64,7 @@ public final class Disarm extends CardImpl { FilterPermanent equipmentFilter = new FilterPermanent(); equipmentFilter.add(new AttachedToPredicate(creatureFilter)); - equipmentFilter.add(new SubtypePredicate(SubType.EQUIPMENT)); + equipmentFilter.add(SubType.EQUIPMENT.getPredicate()); for (Permanent equipment : game.getBattlefield().getAllActivePermanents(equipmentFilter, game)) { creature.removeAttachment(equipment.getId(), game); diff --git a/Mage.Sets/src/mage/cards/d/DistantMelody.java b/Mage.Sets/src/mage/cards/d/DistantMelody.java index e31ad4503f..5f05c3dcea 100644 --- a/Mage.Sets/src/mage/cards/d/DistantMelody.java +++ b/Mage.Sets/src/mage/cards/d/DistantMelody.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; @@ -63,7 +62,7 @@ class DistantMelodyEffect extends OneShotEffect { Choice typeChoice = new ChoiceCreatureType(game.getObject(source.getSourceId())); if (controller != null && controller.choose(Outcome.BoostCreature, typeChoice, game)) { FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); - filter.add(new SubtypePredicate(SubType.byDescription(typeChoice.getChoice()))); + filter.add(SubType.byDescription(typeChoice.getChoice()).getPredicate()); return new DrawCardSourceControllerEffect(new PermanentsOnBattlefieldCount(filter)).apply(game, source); } return false; diff --git a/Mage.Sets/src/mage/cards/d/DistrictGuide.java b/Mage.Sets/src/mage/cards/d/DistrictGuide.java index d8a9c4dbcc..f2a12ef805 100644 --- a/Mage.Sets/src/mage/cards/d/DistrictGuide.java +++ b/Mage.Sets/src/mage/cards/d/DistrictGuide.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; @@ -29,7 +28,7 @@ public final class DistrictGuide extends CardImpl { Predicates.and( CardType.LAND.getPredicate(), new SupertypePredicate(SuperType.BASIC) - ), new SubtypePredicate(SubType.GATE) + ), SubType.GATE.getPredicate() )); } diff --git a/Mage.Sets/src/mage/cards/d/DivinersWand.java b/Mage.Sets/src/mage/cards/d/DivinersWand.java index 5008753221..6b3845a1ff 100644 --- a/Mage.Sets/src/mage/cards/d/DivinersWand.java +++ b/Mage.Sets/src/mage/cards/d/DivinersWand.java @@ -19,7 +19,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -31,7 +30,7 @@ public final class DivinersWand extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("a Wizard creature"); static { - filter.add(new SubtypePredicate(SubType.WIZARD)); + filter.add(SubType.WIZARD.getPredicate()); } public DivinersWand(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DocentOfPerfection.java b/Mage.Sets/src/mage/cards/d/DocentOfPerfection.java index ad42f07062..9b82adc7bc 100644 --- a/Mage.Sets/src/mage/cards/d/DocentOfPerfection.java +++ b/Mage.Sets/src/mage/cards/d/DocentOfPerfection.java @@ -21,7 +21,6 @@ import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.token.HumanWizardToken; @@ -77,7 +76,7 @@ class DocentOfPerfectionEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterPermanent("Wizards"); static { - filter.add(new SubtypePredicate(SubType.WIZARD)); + filter.add(SubType.WIZARD.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/d/DominariasJudgment.java b/Mage.Sets/src/mage/cards/d/DominariasJudgment.java index 9da8564410..98bc64cdbc 100644 --- a/Mage.Sets/src/mage/cards/d/DominariasJudgment.java +++ b/Mage.Sets/src/mage/cards/d/DominariasJudgment.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.StaticFilters; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -29,11 +28,11 @@ public final class DominariasJudgment extends CardImpl { private static final FilterLandPermanent filterForest = new FilterLandPermanent("Forest"); static { - filterPlains.add(new SubtypePredicate(SubType.PLAINS)); - filterIsland.add(new SubtypePredicate(SubType.ISLAND)); - filterSwamp.add(new SubtypePredicate(SubType.SWAMP)); - filterMountain.add(new SubtypePredicate(SubType.MOUNTAIN)); - filterForest.add(new SubtypePredicate(SubType.FOREST)); + filterPlains.add(SubType.PLAINS.getPredicate()); + filterIsland.add(SubType.ISLAND.getPredicate()); + filterSwamp.add(SubType.SWAMP.getPredicate()); + filterMountain.add(SubType.MOUNTAIN.getPredicate()); + filterForest.add(SubType.FOREST.getPredicate()); } public DominariasJudgment(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DormantVolcano.java b/Mage.Sets/src/mage/cards/d/DormantVolcano.java index 8ee5e9f5bb..55b938ce45 100644 --- a/Mage.Sets/src/mage/cards/d/DormantVolcano.java +++ b/Mage.Sets/src/mage/cards/d/DormantVolcano.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -29,7 +28,7 @@ public final class DormantVolcano extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("an untapped Mountain"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/d/DoubtlessOne.java b/Mage.Sets/src/mage/cards/d/DoubtlessOne.java index b29eff1bd4..c7fc9d47d8 100644 --- a/Mage.Sets/src/mage/cards/d/DoubtlessOne.java +++ b/Mage.Sets/src/mage/cards/d/DoubtlessOne.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -25,7 +24,7 @@ public final class DoubtlessOne extends CardImpl { static final FilterPermanent filter = new FilterPermanent("Clerics on the battlefield"); static { - filter.add(new SubtypePredicate(SubType.CLERIC)); + filter.add(SubType.CLERIC.getPredicate()); } public DoubtlessOne(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DownhillCharge.java b/Mage.Sets/src/mage/cards/d/DownhillCharge.java index f14bbae019..d9793eed1c 100644 --- a/Mage.Sets/src/mage/cards/d/DownhillCharge.java +++ b/Mage.Sets/src/mage/cards/d/DownhillCharge.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -27,7 +26,7 @@ public final class DownhillCharge extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Mountain"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public DownhillCharge(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DraconicRoar.java b/Mage.Sets/src/mage/cards/d/DraconicRoar.java index 34102c4f39..fa049bd5e9 100644 --- a/Mage.Sets/src/mage/cards/d/DraconicRoar.java +++ b/Mage.Sets/src/mage/cards/d/DraconicRoar.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -58,7 +57,7 @@ enum DraconicRoarAdjuster implements CostAdjuster { private static final FilterCard filter = new FilterCard("a Dragon card from your hand (you don't have to)"); static { - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } @Override diff --git a/Mage.Sets/src/mage/cards/d/DragonTempest.java b/Mage.Sets/src/mage/cards/d/DragonTempest.java index 2f5ab03aa4..d4d998ad47 100644 --- a/Mage.Sets/src/mage/cards/d/DragonTempest.java +++ b/Mage.Sets/src/mage/cards/d/DragonTempest.java @@ -15,7 +15,6 @@ import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -70,7 +69,7 @@ class DragonTempestDamageEffect extends OneShotEffect { private static final FilterControlledPermanent dragonFilter = new FilterControlledPermanent(); static { - dragonFilter.add(new SubtypePredicate(SubType.DRAGON)); + dragonFilter.add(SubType.DRAGON.getPredicate()); } public DragonTempestDamageEffect() { diff --git a/Mage.Sets/src/mage/cards/d/DragonloftIdol.java b/Mage.Sets/src/mage/cards/d/DragonloftIdol.java index 3947fac7fd..7cad3c0ac7 100644 --- a/Mage.Sets/src/mage/cards/d/DragonloftIdol.java +++ b/Mage.Sets/src/mage/cards/d/DragonloftIdol.java @@ -16,7 +16,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -29,7 +28,7 @@ public final class DragonloftIdol extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } public DragonloftIdol(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DragonlordsPrerogative.java b/Mage.Sets/src/mage/cards/d/DragonlordsPrerogative.java index 68af370d1a..12adb48d29 100644 --- a/Mage.Sets/src/mage/cards/d/DragonlordsPrerogative.java +++ b/Mage.Sets/src/mage/cards/d/DragonlordsPrerogative.java @@ -19,7 +19,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.stack.Spell; import mage.players.Player; @@ -67,7 +66,7 @@ enum DragonlordsPrerogativeAdjuster implements CostAdjuster { private static final FilterCard filter = new FilterCard("a Dragon card from your hand"); static { - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } @Override @@ -86,7 +85,7 @@ class DragonlordsPrerogativeCondition implements Condition { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Dragon"); static { - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } @Override diff --git a/Mage.Sets/src/mage/cards/d/DragonlordsServant.java b/Mage.Sets/src/mage/cards/d/DragonlordsServant.java index 62e4e45f18..25ca504299 100644 --- a/Mage.Sets/src/mage/cards/d/DragonlordsServant.java +++ b/Mage.Sets/src/mage/cards/d/DragonlordsServant.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class DragonlordsServant extends CardImpl { private static final FilterCard filter = new FilterCard("Dragon spells"); static { - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } public DragonlordsServant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DragonskullSummit.java b/Mage.Sets/src/mage/cards/d/DragonskullSummit.java index cf5e068dd0..61fa69ba6d 100644 --- a/Mage.Sets/src/mage/cards/d/DragonskullSummit.java +++ b/Mage.Sets/src/mage/cards/d/DragonskullSummit.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -28,7 +27,7 @@ public final class DragonskullSummit extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.SWAMP), new SubtypePredicate(SubType.MOUNTAIN))); + filter.add(Predicates.or(SubType.SWAMP.getPredicate(), SubType.MOUNTAIN.getPredicate())); } public DragonskullSummit(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DragonspeakerShaman.java b/Mage.Sets/src/mage/cards/d/DragonspeakerShaman.java index 33c27725a8..88014c095a 100644 --- a/Mage.Sets/src/mage/cards/d/DragonspeakerShaman.java +++ b/Mage.Sets/src/mage/cards/d/DragonspeakerShaman.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class DragonspeakerShaman extends CardImpl { private static final FilterCard filter = new FilterCard("Dragon spells"); static { - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } public DragonspeakerShaman(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/Dragonstorm.java b/Mage.Sets/src/mage/cards/d/Dragonstorm.java index e93324575a..65afa92564 100644 --- a/Mage.Sets/src/mage/cards/d/Dragonstorm.java +++ b/Mage.Sets/src/mage/cards/d/Dragonstorm.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -21,7 +20,7 @@ public final class Dragonstorm extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("Dragon permanent card"); static { - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } public Dragonstorm(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DranasChosen.java b/Mage.Sets/src/mage/cards/d/DranasChosen.java index d0dd78f548..0e51dddc53 100644 --- a/Mage.Sets/src/mage/cards/d/DranasChosen.java +++ b/Mage.Sets/src/mage/cards/d/DranasChosen.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.permanent.token.ZombieToken; import mage.target.common.TargetControlledPermanent; @@ -30,7 +29,7 @@ public final class DranasChosen extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("an untapped Ally you control"); static { - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/d/DreamcallerSiren.java b/Mage.Sets/src/mage/cards/d/DreamcallerSiren.java index c0550a2794..9d1ee44583 100644 --- a/Mage.Sets/src/mage/cards/d/DreamcallerSiren.java +++ b/Mage.Sets/src/mage/cards/d/DreamcallerSiren.java @@ -17,7 +17,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetNonlandPermanent; @@ -31,7 +30,7 @@ public final class DreamcallerSiren extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another Pirate"); static { - filter.add(new SubtypePredicate(SubType.PIRATE)); + filter.add(SubType.PIRATE.getPredicate()); filter.add(AnotherPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/d/Dreamwinder.java b/Mage.Sets/src/mage/cards/d/Dreamwinder.java index 6f09c5865a..966f746c42 100644 --- a/Mage.Sets/src/mage/cards/d/Dreamwinder.java +++ b/Mage.Sets/src/mage/cards/d/Dreamwinder.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.Target; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetLandPermanent; @@ -44,7 +43,7 @@ public final class Dreamwinder extends CardImpl { Target target = new TargetLandPermanent(); ability.addTarget(target); FilterControlledLandPermanent filter = new FilterControlledLandPermanent("an Island"); - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(1, 1, filter, true))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java b/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java index d0613ac520..a4db2f0d5b 100644 --- a/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java +++ b/Mage.Sets/src/mage/cards/d/DrogskolCavalry.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.permanent.token.SpiritWhiteToken; @@ -29,7 +28,7 @@ public final class DrogskolCavalry extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new SubtypePredicate(SubType.SPIRIT)); + filter.add(SubType.SPIRIT.getPredicate()); } public DrogskolCavalry(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DroidFactory.java b/Mage.Sets/src/mage/cards/d/DroidFactory.java index 93771bafff..e7085a8906 100644 --- a/Mage.Sets/src/mage/cards/d/DroidFactory.java +++ b/Mage.Sets/src/mage/cards/d/DroidFactory.java @@ -13,7 +13,6 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; @@ -60,9 +59,9 @@ public final class DroidFactory extends CardImpl { FilterCard filter = new FilterCard("basic Plains, Island or Swamp"); filter.add(CardType.LAND.getPredicate()); List> subtypePredicates = new ArrayList<>(); - subtypePredicates.add(new SubtypePredicate(SubType.SWAMP)); - subtypePredicates.add(new SubtypePredicate(SubType.PLAINS)); - subtypePredicates.add(new SubtypePredicate(SubType.ISLAND)); + subtypePredicates.add(SubType.SWAMP.getPredicate()); + subtypePredicates.add(SubType.PLAINS.getPredicate()); + subtypePredicates.add(SubType.ISLAND.getPredicate()); filter.add(Predicates.or(subtypePredicates)); filter.add(new SupertypePredicate(SuperType.BASIC)); TargetCardInLibrary target = new TargetCardInLibrary(filter); diff --git a/Mage.Sets/src/mage/cards/d/DromarsCavern.java b/Mage.Sets/src/mage/cards/d/DromarsCavern.java index 3c495dfedb..cd960bcdcc 100644 --- a/Mage.Sets/src/mage/cards/d/DromarsCavern.java +++ b/Mage.Sets/src/mage/cards/d/DromarsCavern.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import java.util.UUID; @@ -26,7 +25,7 @@ public final class DromarsCavern extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("non-Lair land"); static{ - filter.add(Predicates.not(new SubtypePredicate(SubType.LAIR))); + filter.add(Predicates.not(SubType.LAIR.getPredicate())); } public DromarsCavern(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); diff --git a/Mage.Sets/src/mage/cards/d/Drought.java b/Mage.Sets/src/mage/cards/d/Drought.java index b641ccb450..201ab8d18d 100644 --- a/Mage.Sets/src/mage/cards/d/Drought.java +++ b/Mage.Sets/src/mage/cards/d/Drought.java @@ -20,7 +20,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.target.common.TargetControlledPermanent; @@ -58,7 +57,7 @@ class DroughtAdditionalCostEffect extends CostModificationEffectImpl { private boolean appliesToSpells; private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Swamp"); static{ - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } DroughtAdditionalCostEffect(boolean appliesToSpells) { diff --git a/Mage.Sets/src/mage/cards/d/DroverOfTheMighty.java b/Mage.Sets/src/mage/cards/d/DroverOfTheMighty.java index fb3db30cf5..8de1e14770 100644 --- a/Mage.Sets/src/mage/cards/d/DroverOfTheMighty.java +++ b/Mage.Sets/src/mage/cards/d/DroverOfTheMighty.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -23,7 +22,7 @@ public final class DroverOfTheMighty extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Dinosaur"); static { - filter.add(new SubtypePredicate(SubType.DINOSAUR)); + filter.add(SubType.DINOSAUR.getPredicate()); } public DroverOfTheMighty(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DrownedCatacomb.java b/Mage.Sets/src/mage/cards/d/DrownedCatacomb.java index 8b00aa3809..5a1835e7be 100644 --- a/Mage.Sets/src/mage/cards/d/DrownedCatacomb.java +++ b/Mage.Sets/src/mage/cards/d/DrownedCatacomb.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -28,7 +27,7 @@ public final class DrownedCatacomb extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.SWAMP), new SubtypePredicate(SubType.ISLAND))); + filter.add(Predicates.or(SubType.SWAMP.getPredicate(), SubType.ISLAND.getPredicate())); } public DrownedCatacomb(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DrownerOfHope.java b/Mage.Sets/src/mage/cards/d/DrownerOfHope.java index be6d43a340..f1cf57c5d7 100644 --- a/Mage.Sets/src/mage/cards/d/DrownerOfHope.java +++ b/Mage.Sets/src/mage/cards/d/DrownerOfHope.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.EldraziScionToken; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -33,8 +32,8 @@ public final class DrownerOfHope extends CardImpl { static { FILTER.add(Predicates.and( - new SubtypePredicate(SubType.ELDRAZI), - new SubtypePredicate(SubType.SCION))); + SubType.ELDRAZI.getPredicate(), + SubType.SCION.getPredicate())); } public DrownerOfHope(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DrownerOfSecrets.java b/Mage.Sets/src/mage/cards/d/DrownerOfSecrets.java index 65596971ff..88de1e5cce 100644 --- a/Mage.Sets/src/mage/cards/d/DrownerOfSecrets.java +++ b/Mage.Sets/src/mage/cards/d/DrownerOfSecrets.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; @@ -28,7 +27,7 @@ public final class DrownerOfSecrets extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Merfolk you control"); static { - filter.add(new SubtypePredicate(SubType.MERFOLK)); + filter.add(SubType.MERFOLK.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/d/DrudgeSpell.java b/Mage.Sets/src/mage/cards/d/DrudgeSpell.java index efd94be990..8ae4cba960 100644 --- a/Mage.Sets/src/mage/cards/d/DrudgeSpell.java +++ b/Mage.Sets/src/mage/cards/d/DrudgeSpell.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.SkeletonToken; import mage.target.common.TargetCardInYourGraveyard; @@ -31,7 +30,7 @@ public final class DrudgeSpell extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Skeleton tokens"); static { - filter.add(new SubtypePredicate(SubType.SKELETON)); + filter.add(SubType.SKELETON.getPredicate()); filter.add(TokenPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/d/DuergarHedgeMage.java b/Mage.Sets/src/mage/cards/d/DuergarHedgeMage.java index c1f81adb81..fe2d5aa825 100644 --- a/Mage.Sets/src/mage/cards/d/DuergarHedgeMage.java +++ b/Mage.Sets/src/mage/cards/d/DuergarHedgeMage.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetArtifactPermanent; import mage.target.common.TargetEnchantmentPermanent; @@ -28,8 +27,8 @@ public final class DuergarHedgeMage extends CardImpl { private static final FilterLandPermanent filter2 = new FilterLandPermanent("a Plains"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); - filter2.add(new SubtypePredicate(SubType.PLAINS)); + filter.add(SubType.MOUNTAIN.getPredicate()); + filter2.add(SubType.PLAINS.getPredicate()); } private static final String rule1 = "When {this} enters the battlefield, if you control two or more Mountains, you may destroy target artifact."; private static final String rule2 = "When {this} enters the battlefield, if you control two or more Plains, you may destroy target enchantment."; diff --git a/Mage.Sets/src/mage/cards/d/DuneDiviner.java b/Mage.Sets/src/mage/cards/d/DuneDiviner.java index 55a9939923..107607d4a0 100644 --- a/Mage.Sets/src/mage/cards/d/DuneDiviner.java +++ b/Mage.Sets/src/mage/cards/d/DuneDiviner.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -28,7 +27,7 @@ public final class DuneDiviner extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("an untapped Desert you control"); static { - filter.add(new SubtypePredicate(SubType.DESERT)); + filter.add(SubType.DESERT.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/d/DungroveElder.java b/Mage.Sets/src/mage/cards/d/DungroveElder.java index 6a3d12ea27..c54b9e5780 100644 --- a/Mage.Sets/src/mage/cards/d/DungroveElder.java +++ b/Mage.Sets/src/mage/cards/d/DungroveElder.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class DungroveElder extends CardImpl { static final FilterControlledPermanent filterLands = new FilterControlledPermanent("Forests you control"); static { - filterLands.add(new SubtypePredicate(SubType.FOREST)); + filterLands.add(SubType.FOREST.getPredicate()); } public DungroveElder (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DwarvenBloodboiler.java b/Mage.Sets/src/mage/cards/d/DwarvenBloodboiler.java index 1638cf682b..7a7a076a0f 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenBloodboiler.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenBloodboiler.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -30,7 +29,7 @@ public final class DwarvenBloodboiler extends CardImpl { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new SubtypePredicate(SubType.DWARF)); + filter.add(SubType.DWARF.getPredicate()); } public DwarvenBloodboiler(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DwarvenDemolitionTeam.java b/Mage.Sets/src/mage/cards/d/DwarvenDemolitionTeam.java index 8e27220d7f..7d281fabe9 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenDemolitionTeam.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenDemolitionTeam.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -25,7 +24,7 @@ public final class DwarvenDemolitionTeam extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Wall"); static{ - filter.add(new SubtypePredicate(SubType.WALL)); + filter.add(SubType.WALL.getPredicate()); } public DwarvenDemolitionTeam(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DwarvenLieutenant.java b/Mage.Sets/src/mage/cards/d/DwarvenLieutenant.java index 925439eea4..8fac09ec41 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenLieutenant.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenLieutenant.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -26,7 +25,7 @@ public final class DwarvenLieutenant extends CardImpl { static FilterCreaturePermanent filter = new FilterCreaturePermanent("Dwarf creature"); static { - filter.add(new SubtypePredicate(SubType.DWARF)); + filter.add(SubType.DWARF.getPredicate()); } public DwarvenLieutenant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DwarvenPony.java b/Mage.Sets/src/mage/cards/d/DwarvenPony.java index a95c853504..89a4f5dd9c 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenPony.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenPony.java @@ -16,7 +16,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -28,7 +27,7 @@ public final class DwarvenPony extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Dwarf creature"); static { - filter.add(new SubtypePredicate(SubType.DWARF)); + filter.add(SubType.DWARF.getPredicate()); } public DwarvenPony(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DwarvenRecruiter.java b/Mage.Sets/src/mage/cards/d/DwarvenRecruiter.java index a9ce96ce3d..9e03d2ae2c 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenRecruiter.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenRecruiter.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -21,7 +20,7 @@ public final class DwarvenRecruiter extends CardImpl { private static final FilterCard filter = new FilterCard("Dwarf cards"); static { - filter.add(new SubtypePredicate(SubType.DWARF)); + filter.add(SubType.DWARF.getPredicate()); } public DwarvenRecruiter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DwynensElite.java b/Mage.Sets/src/mage/cards/d/DwynensElite.java index 4e9e11890b..3447392fc3 100644 --- a/Mage.Sets/src/mage/cards/d/DwynensElite.java +++ b/Mage.Sets/src/mage/cards/d/DwynensElite.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.permanent.token.ElfToken; @@ -28,7 +27,7 @@ public final class DwynensElite extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public DwynensElite(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EarlOfSquirrel.java b/Mage.Sets/src/mage/cards/e/EarlOfSquirrel.java index d213ba19de..9e2a260423 100644 --- a/Mage.Sets/src/mage/cards/e/EarlOfSquirrel.java +++ b/Mage.Sets/src/mage/cards/e/EarlOfSquirrel.java @@ -16,8 +16,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.util.SubTypeList; @@ -35,7 +33,7 @@ public final class EarlOfSquirrel extends CardImpl { static { filter.add(TokenPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); - filter2.add(new SubtypePredicate(SubType.SQUIRREL)); + filter2.add(SubType.SQUIRREL.getPredicate()); } public EarlOfSquirrel(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EarthServant.java b/Mage.Sets/src/mage/cards/e/EarthServant.java index 4505b2fb55..5682c411d5 100644 --- a/Mage.Sets/src/mage/cards/e/EarthServant.java +++ b/Mage.Sets/src/mage/cards/e/EarthServant.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -23,7 +22,7 @@ public final class EarthServant extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Mountain you control"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/e/Earthblighter.java b/Mage.Sets/src/mage/cards/e/Earthblighter.java index 00a2a16ec2..97cd4cd808 100644 --- a/Mage.Sets/src/mage/cards/e/Earthblighter.java +++ b/Mage.Sets/src/mage/cards/e/Earthblighter.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetLandPermanent; @@ -27,7 +26,7 @@ public final class Earthblighter extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Goblin"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public Earthblighter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EchoBaseCommando.java b/Mage.Sets/src/mage/cards/e/EchoBaseCommando.java index 2e89b8fd20..7a32c00af8 100644 --- a/Mage.Sets/src/mage/cards/e/EchoBaseCommando.java +++ b/Mage.Sets/src/mage/cards/e/EchoBaseCommando.java @@ -14,7 +14,6 @@ import mage.constants.*; import mage.filter.Filter; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -29,7 +28,7 @@ public final class EchoBaseCommando extends CardImpl { private static final Filter filter = new FilterPermanent("Beasts"); static { - filter.add(new SubtypePredicate(SubType.BEAST)); + filter.add(SubType.BEAST.getPredicate()); } public EchoBaseCommando(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EdgarMarkov.java b/Mage.Sets/src/mage/cards/e/EdgarMarkov.java index 19f8f9ce3a..947a6f87bd 100644 --- a/Mage.Sets/src/mage/cards/e/EdgarMarkov.java +++ b/Mage.Sets/src/mage/cards/e/EdgarMarkov.java @@ -22,7 +22,6 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterSpell; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.EdgarMarkovToken; /** @@ -35,8 +34,8 @@ public final class EdgarMarkov extends CardImpl { private static final FilterSpell filter2 = new FilterSpell("another Vampire spell");//"another" is just there for templating, doesn't affect the card itself static { - filter.add(new SubtypePredicate(SubType.VAMPIRE)); - filter2.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); + filter2.add(SubType.VAMPIRE.getPredicate()); } public EdgarMarkov(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/Edgewalker.java b/Mage.Sets/src/mage/cards/e/Edgewalker.java index 68b6d57aa3..a33fb303b7 100644 --- a/Mage.Sets/src/mage/cards/e/Edgewalker.java +++ b/Mage.Sets/src/mage/cards/e/Edgewalker.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class Edgewalker extends CardImpl { private static final FilterCard filter = new FilterCard("Cleric spells"); static { - filter.add(new SubtypePredicate(SubType.CLERIC)); + filter.add(SubType.CLERIC.getPredicate()); } public Edgewalker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EerieProcession.java b/Mage.Sets/src/mage/cards/e/EerieProcession.java index 910ef5fb5d..15ab63de48 100644 --- a/Mage.Sets/src/mage/cards/e/EerieProcession.java +++ b/Mage.Sets/src/mage/cards/e/EerieProcession.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; import java.util.UUID; @@ -21,7 +20,7 @@ public final class EerieProcession extends CardImpl { private static final FilterCard filter = new FilterCard("Arcane card"); static { - filter.add(new SubtypePredicate(SubType.ARCANE)); + filter.add(SubType.ARCANE.getPredicate()); } public EerieProcession(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EidolonOfCountlessBattles.java b/Mage.Sets/src/mage/cards/e/EidolonOfCountlessBattles.java index ba78ff842c..e5a1210e08 100644 --- a/Mage.Sets/src/mage/cards/e/EidolonOfCountlessBattles.java +++ b/Mage.Sets/src/mage/cards/e/EidolonOfCountlessBattles.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -30,7 +29,7 @@ public final class EidolonOfCountlessBattles extends CardImpl { static { filter.add(Predicates.or( CardType.CREATURE.getPredicate(), - new SubtypePredicate(SubType.AURA))); + SubType.AURA.getPredicate())); } public EidolonOfCountlessBattles(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EladamriLordOfLeaves.java b/Mage.Sets/src/mage/cards/e/EladamriLordOfLeaves.java index 4d256faaa1..6779ae39d8 100644 --- a/Mage.Sets/src/mage/cards/e/EladamriLordOfLeaves.java +++ b/Mage.Sets/src/mage/cards/e/EladamriLordOfLeaves.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,8 +23,8 @@ public final class EladamriLordOfLeaves extends CardImpl { private static final FilterPermanent filterPermanents = new FilterPermanent("Elves"); static { - filterCreatures.add(new SubtypePredicate(SubType.ELF)); - filterPermanents.add(new SubtypePredicate(SubType.ELF)); + filterCreatures.add(SubType.ELF.getPredicate()); + filterPermanents.add(SubType.ELF.getPredicate()); } public EladamriLordOfLeaves(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/ElderSpawn.java b/Mage.Sets/src/mage/cards/e/ElderSpawn.java index 1d65526cdc..e7b65b8cba 100644 --- a/Mage.Sets/src/mage/cards/e/ElderSpawn.java +++ b/Mage.Sets/src/mage/cards/e/ElderSpawn.java @@ -20,7 +20,6 @@ import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -65,7 +64,7 @@ class ElderSpawnEffect extends OneShotEffect { private static final FilterControlledPermanent filter = new FilterControlledPermanent("an Island"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } public ElderSpawnEffect() { diff --git a/Mage.Sets/src/mage/cards/e/EliteInquisitor.java b/Mage.Sets/src/mage/cards/e/EliteInquisitor.java index 60b7fdce01..b7561a2bef 100644 --- a/Mage.Sets/src/mage/cards/e/EliteInquisitor.java +++ b/Mage.Sets/src/mage/cards/e/EliteInquisitor.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @author nantuko @@ -23,9 +22,9 @@ public final class EliteInquisitor extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("Vampires, from Werewolves, and from Zombies"); static {filter.add(Predicates.or( - new SubtypePredicate(SubType.VAMPIRE), - new SubtypePredicate(SubType.WEREWOLF), - new SubtypePredicate(SubType.ZOMBIE) + SubType.VAMPIRE.getPredicate(), + SubType.WEREWOLF.getPredicate(), + SubType.ZOMBIE.getPredicate() )); } diff --git a/Mage.Sets/src/mage/cards/e/ElvenPalisade.java b/Mage.Sets/src/mage/cards/e/ElvenPalisade.java index 7441caef35..b70fef88da 100644 --- a/Mage.Sets/src/mage/cards/e/ElvenPalisade.java +++ b/Mage.Sets/src/mage/cards/e/ElvenPalisade.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetAttackingCreature; import mage.target.common.TargetControlledPermanent; @@ -25,7 +24,7 @@ public final class ElvenPalisade extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Forest"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public ElvenPalisade(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/ElvenRiders.java b/Mage.Sets/src/mage/cards/e/ElvenRiders.java index 6e1d08358a..6e1ff717b4 100644 --- a/Mage.Sets/src/mage/cards/e/ElvenRiders.java +++ b/Mage.Sets/src/mage/cards/e/ElvenRiders.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -25,7 +24,7 @@ public final class ElvenRiders extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("except by Walls and/or creatures with flying"); static { - filter.add(Predicates.not(Predicates.or(new SubtypePredicate(SubType.WALL), new AbilityPredicate(FlyingAbility.class)))); + filter.add(Predicates.not(Predicates.or(SubType.WALL.getPredicate(), new AbilityPredicate(FlyingAbility.class)))); } public ElvenRiders(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/ElvishArchdruid.java b/Mage.Sets/src/mage/cards/e/ElvishArchdruid.java index e04131be3a..837c6b2991 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishArchdruid.java +++ b/Mage.Sets/src/mage/cards/e/ElvishArchdruid.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -29,8 +28,8 @@ public final class ElvishArchdruid extends CardImpl { private static final FilterControlledCreaturePermanent filterCount = new FilterControlledCreaturePermanent("Elf you control"); static { - filter.add(new SubtypePredicate(SubType.ELF)); - filterCount.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); + filterCount.add(SubType.ELF.getPredicate()); } public ElvishArchdruid(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/ElvishBranchbender.java b/Mage.Sets/src/mage/cards/e/ElvishBranchbender.java index 117f6d6381..9f9a482058 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishBranchbender.java +++ b/Mage.Sets/src/mage/cards/e/ElvishBranchbender.java @@ -15,10 +15,8 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.token.TokenImpl; -import mage.game.permanent.token.Token; import mage.target.TargetPermanent; /** @@ -29,7 +27,7 @@ public final class ElvishBranchbender extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Forest"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public ElvishBranchbender(UUID ownerId, CardSetInfo setInfo) { @@ -60,7 +58,7 @@ class ElvishBranchbenderEffect extends OneShotEffect { static final FilterControlledPermanent filter = new FilterControlledPermanent("Elves you control"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } ElvishBranchbenderEffect() { diff --git a/Mage.Sets/src/mage/cards/e/ElvishChampion.java b/Mage.Sets/src/mage/cards/e/ElvishChampion.java index 307008b7ce..017e14815a 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishChampion.java +++ b/Mage.Sets/src/mage/cards/e/ElvishChampion.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class ElvishChampion extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Elf creatures"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public ElvishChampion(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/ElvishClancaller.java b/Mage.Sets/src/mage/cards/e/ElvishClancaller.java index 9be147e675..619d4ac5c9 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishClancaller.java +++ b/Mage.Sets/src/mage/cards/e/ElvishClancaller.java @@ -18,7 +18,6 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -31,7 +30,7 @@ public final class ElvishClancaller extends CardImpl { private static final FilterCard filter2 = new FilterCard("card named Elvish Clancaller"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); filter2.add(new NamePredicate("Elvish Clancaller")); } diff --git a/Mage.Sets/src/mage/cards/e/ElvishEulogist.java b/Mage.Sets/src/mage/cards/e/ElvishEulogist.java index 3d952cc24c..30adc4c9a0 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishEulogist.java +++ b/Mage.Sets/src/mage/cards/e/ElvishEulogist.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class ElvishEulogist extends CardImpl { private static final FilterCard filter = new FilterCard("Elf"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public ElvishEulogist(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/ElvishFarmer.java b/Mage.Sets/src/mage/cards/e/ElvishFarmer.java index 1e130c80d6..d113876d56 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishFarmer.java +++ b/Mage.Sets/src/mage/cards/e/ElvishFarmer.java @@ -18,7 +18,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SaprolingToken; import mage.target.common.TargetControlledPermanent; @@ -31,7 +30,7 @@ public final class ElvishFarmer extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Saproling"); static { - filter.add(new SubtypePredicate(SubType.SAPROLING)); + filter.add(SubType.SAPROLING.getPredicate()); } public ElvishFarmer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/ElvishHandservant.java b/Mage.Sets/src/mage/cards/e/ElvishHandservant.java index 27a19cf7df..4980f8b60e 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishHandservant.java +++ b/Mage.Sets/src/mage/cards/e/ElvishHandservant.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class ElvishHandservant extends CardImpl { private static final FilterSpell filter = new FilterSpell("Giant"); static { - filter.add(new SubtypePredicate(SubType.GIANT)); + filter.add(SubType.GIANT.getPredicate()); } public ElvishHandservant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/ElvishHarbinger.java b/Mage.Sets/src/mage/cards/e/ElvishHarbinger.java index 704a6a1f8c..b4ca149cb4 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishHarbinger.java +++ b/Mage.Sets/src/mage/cards/e/ElvishHarbinger.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -23,7 +22,7 @@ public final class ElvishHarbinger extends CardImpl { static final FilterCard filter = new FilterCard("Elf card"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public ElvishHarbinger(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); diff --git a/Mage.Sets/src/mage/cards/e/ElvishPathcutter.java b/Mage.Sets/src/mage/cards/e/ElvishPathcutter.java index bc3b17f719..12bd6ad4de 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishPathcutter.java +++ b/Mage.Sets/src/mage/cards/e/ElvishPathcutter.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -27,7 +26,7 @@ public final class ElvishPathcutter extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Elf creature"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public ElvishPathcutter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/ElvishPromenade.java b/Mage.Sets/src/mage/cards/e/ElvishPromenade.java index 0c9dde2a4e..14e08c958d 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishPromenade.java +++ b/Mage.Sets/src/mage/cards/e/ElvishPromenade.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.ElfToken; /** @@ -21,7 +20,7 @@ public final class ElvishPromenade extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Elf you control"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public ElvishPromenade(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/ElvishSoultiller.java b/Mage.Sets/src/mage/cards/e/ElvishSoultiller.java index e5bbd37e20..a7153fbaa5 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishSoultiller.java +++ b/Mage.Sets/src/mage/cards/e/ElvishSoultiller.java @@ -18,7 +18,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; @@ -77,7 +76,7 @@ class ElvishSoultillerEffect extends OneShotEffect { } Cards cardsToLibrary = new CardsImpl(); FilterCreatureCard filter = new FilterCreatureCard(); - filter.add(new SubtypePredicate(SubType.byDescription(typeChoice.getChoice()))); + filter.add(SubType.byDescription(typeChoice.getChoice()).getPredicate()); cardsToLibrary.addAll(controller.getGraveyard().getCards(filter, source.getSourceId(), source.getControllerId(), game)); controller.putCardsOnTopOfLibrary(cardsToLibrary, game, source, false); controller.shuffleLibrary(source, game); diff --git a/Mage.Sets/src/mage/cards/e/ElvishVanguard.java b/Mage.Sets/src/mage/cards/e/ElvishVanguard.java index 7591f62213..345e41fc34 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishVanguard.java +++ b/Mage.Sets/src/mage/cards/e/ElvishVanguard.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -23,7 +22,7 @@ public final class ElvishVanguard extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("another Elf"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/e/EmbalmersTools.java b/Mage.Sets/src/mage/cards/e/EmbalmersTools.java index 4ca900ff9f..50d45a9035 100644 --- a/Mage.Sets/src/mage/cards/e/EmbalmersTools.java +++ b/Mage.Sets/src/mage/cards/e/EmbalmersTools.java @@ -17,7 +17,6 @@ import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; @@ -36,7 +35,7 @@ public final class EmbalmersTools extends CardImpl { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public EmbalmersTools(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EmeraldCharm.java b/Mage.Sets/src/mage/cards/e/EmeraldCharm.java index bb67f751f5..b01f5645d1 100644 --- a/Mage.Sets/src/mage/cards/e/EmeraldCharm.java +++ b/Mage.Sets/src/mage/cards/e/EmeraldCharm.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetEnchantmentPermanent; @@ -28,7 +27,7 @@ public final class EmeraldCharm extends CardImpl { private static final FilterEnchantmentPermanent filter = new FilterEnchantmentPermanent("non-Aura enchantment"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.AURA))); + filter.add(Predicates.not(SubType.AURA.getPredicate())); } public EmeraldCharm(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EmeriaTheSkyRuin.java b/Mage.Sets/src/mage/cards/e/EmeriaTheSkyRuin.java index fb5ea3416a..aadd23c639 100644 --- a/Mage.Sets/src/mage/cards/e/EmeriaTheSkyRuin.java +++ b/Mage.Sets/src/mage/cards/e/EmeriaTheSkyRuin.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -52,7 +51,7 @@ class EmeriaTheSkyRuinTriggeredAbility extends TriggeredAbilityImpl { static final FilterLandPermanent filter = new FilterLandPermanent("Plains"); static { - filter.add(new SubtypePredicate(SubType.PLAINS)); + filter.add(SubType.PLAINS.getPredicate()); } public EmeriaTheSkyRuinTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/e/EmrakulsEvangel.java b/Mage.Sets/src/mage/cards/e/EmrakulsEvangel.java index 33faa4a966..0ab6e19089 100644 --- a/Mage.Sets/src/mage/cards/e/EmrakulsEvangel.java +++ b/Mage.Sets/src/mage/cards/e/EmrakulsEvangel.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -62,7 +61,7 @@ class EmrakulsEvangelCost extends CostImpl { static { filter.add(AnotherPredicate.instance); - filter.add(Predicates.not(new SubtypePredicate(SubType.ELDRAZI))); + filter.add(Predicates.not(SubType.ELDRAZI.getPredicate())); } private int numSacrificed = 1; // always sacrifices self at least diff --git a/Mage.Sets/src/mage/cards/e/EmrakulsInfluence.java b/Mage.Sets/src/mage/cards/e/EmrakulsInfluence.java index ed1764f678..419fbf1f96 100644 --- a/Mage.Sets/src/mage/cards/e/EmrakulsInfluence.java +++ b/Mage.Sets/src/mage/cards/e/EmrakulsInfluence.java @@ -11,7 +11,6 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class EmrakulsInfluence extends CardImpl { private static final FilterSpell filterSpell = new FilterSpell("Eldrazi creature spell with converted mana cost 7 or greater"); static { - filterSpell.add(new SubtypePredicate( SubType.ELDRAZI)); + filterSpell.add(SubType.ELDRAZI.getPredicate()); filterSpell.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 6)); } diff --git a/Mage.Sets/src/mage/cards/e/EnchantmentAlteration.java b/Mage.Sets/src/mage/cards/e/EnchantmentAlteration.java index c0594751a6..8b611fb6ac 100644 --- a/Mage.Sets/src/mage/cards/e/EnchantmentAlteration.java +++ b/Mage.Sets/src/mage/cards/e/EnchantmentAlteration.java @@ -14,7 +14,6 @@ import mage.filter.predicate.ObjectSourcePlayer; import mage.filter.predicate.ObjectSourcePlayerPredicate; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AttachmentAttachedToCardTypePredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.stack.StackObject; @@ -32,7 +31,7 @@ public final class EnchantmentAlteration extends CardImpl { private static final FilterPermanent filter2 = new FilterPermanent("another target permanent that shares that type of creature or land"); static { - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); filter.add(Predicates.or(new AttachmentAttachedToCardTypePredicate(CardType.CREATURE), new AttachmentAttachedToCardTypePredicate(CardType.LAND))); filter2.add(new SharesEnchantedCardTypePredicate()); diff --git a/Mage.Sets/src/mage/cards/e/EndemicPlague.java b/Mage.Sets/src/mage/cards/e/EndemicPlague.java index cb6ed31d3c..acadec173f 100644 --- a/Mage.Sets/src/mage/cards/e/EndemicPlague.java +++ b/Mage.Sets/src/mage/cards/e/EndemicPlague.java @@ -18,7 +18,6 @@ import mage.constants.SubTypeSet; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; @@ -75,10 +74,10 @@ class EndemicPlagueEffect extends OneShotEffect { if (subs == null) { return false; } - List preds = new ArrayList<>(); + List preds = new ArrayList<>(); for (SubType subType : subs) { if (subType.getSubTypeSet() == SubTypeSet.CreatureType) { - preds.add(new SubtypePredicate(subType)); + preds.add(subType.getPredicate()); } } FilterCreaturePermanent filter = new FilterCreaturePermanent(); diff --git a/Mage.Sets/src/mage/cards/e/EndlessHorizons.java b/Mage.Sets/src/mage/cards/e/EndlessHorizons.java index ef0aee658c..7f598e80c6 100644 --- a/Mage.Sets/src/mage/cards/e/EndlessHorizons.java +++ b/Mage.Sets/src/mage/cards/e/EndlessHorizons.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterLandCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.ExileZone; import mage.game.Game; import mage.players.Player; @@ -53,7 +52,7 @@ class EndlessHorizonsEffect extends SearchEffect { private static final FilterLandCard filter = new FilterLandCard("Plains card"); static { - filter.add(new SubtypePredicate(SubType.PLAINS)); + filter.add(SubType.PLAINS.getPredicate()); } public EndlessHorizonsEffect() { diff --git a/Mage.Sets/src/mage/cards/e/EndlessRanksOfTheDead.java b/Mage.Sets/src/mage/cards/e/EndlessRanksOfTheDead.java index f558e5a447..096ec2a98c 100644 --- a/Mage.Sets/src/mage/cards/e/EndlessRanksOfTheDead.java +++ b/Mage.Sets/src/mage/cards/e/EndlessRanksOfTheDead.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent.EventType; import mage.game.permanent.token.ZombieToken; @@ -48,7 +47,7 @@ class HalfZombiesCount implements DynamicValue { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } @Override diff --git a/Mage.Sets/src/mage/cards/e/EngulfTheShore.java b/Mage.Sets/src/mage/cards/e/EngulfTheShore.java index cca249a113..fb7a0bdc5d 100644 --- a/Mage.Sets/src/mage/cards/e/EngulfTheShore.java +++ b/Mage.Sets/src/mage/cards/e/EngulfTheShore.java @@ -13,7 +13,6 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.ToughnessPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -47,7 +46,7 @@ class EngulfTheShoreEffect extends OneShotEffect { private static final FilterControlledPermanent filter = new FilterControlledPermanent("number of Islands you control"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } public EngulfTheShoreEffect() { diff --git a/Mage.Sets/src/mage/cards/e/EnlistmentOfficer.java b/Mage.Sets/src/mage/cards/e/EnlistmentOfficer.java index 8114080271..d2e4c095d7 100644 --- a/Mage.Sets/src/mage/cards/e/EnlistmentOfficer.java +++ b/Mage.Sets/src/mage/cards/e/EnlistmentOfficer.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -23,7 +22,7 @@ public final class EnlistmentOfficer extends CardImpl { private static final FilterCard filter = new FilterCard("Soldier cards"); static { - filter.add(new SubtypePredicate(SubType.SOLDIER)); + filter.add(SubType.SOLDIER.getPredicate()); } public EnlistmentOfficer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/Ensnare.java b/Mage.Sets/src/mage/cards/e/Ensnare.java index 79d83fac7c..832425443a 100644 --- a/Mage.Sets/src/mage/cards/e/Ensnare.java +++ b/Mage.Sets/src/mage/cards/e/Ensnare.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import static mage.filter.StaticFilters.FILTER_PERMANENT_CREATURES; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -23,7 +22,7 @@ public final class Ensnare extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("Islands"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } public Ensnare(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EraOfInnovation.java b/Mage.Sets/src/mage/cards/e/EraOfInnovation.java index 6c59092513..0a7129a8a5 100644 --- a/Mage.Sets/src/mage/cards/e/EraOfInnovation.java +++ b/Mage.Sets/src/mage/cards/e/EraOfInnovation.java @@ -19,7 +19,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -31,7 +30,7 @@ public final class EraOfInnovation extends CardImpl { static { filter.add(Predicates.or(CardType.ARTIFACT.getPredicate(), - new SubtypePredicate(SubType.ARTIFICER))); + SubType.ARTIFICER.getPredicate())); } public EraOfInnovation(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/ErhnamDjinn.java b/Mage.Sets/src/mage/cards/e/ErhnamDjinn.java index 31b58b0f22..ff637e20be 100644 --- a/Mage.Sets/src/mage/cards/e/ErhnamDjinn.java +++ b/Mage.Sets/src/mage/cards/e/ErhnamDjinn.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -25,7 +24,7 @@ public final class ErhnamDjinn extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Wall creature an opponent controls"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.WALL))); + filter.add(Predicates.not(SubType.WALL.getPredicate())); filter.add(new ControllerPredicate(TargetController.OPPONENT)); } diff --git a/Mage.Sets/src/mage/cards/e/EsperPanorama.java b/Mage.Sets/src/mage/cards/e/EsperPanorama.java index e51e305c6b..905ba3f246 100644 --- a/Mage.Sets/src/mage/cards/e/EsperPanorama.java +++ b/Mage.Sets/src/mage/cards/e/EsperPanorama.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; @@ -30,9 +29,9 @@ public final class EsperPanorama extends CardImpl { filter.add(CardType.LAND.getPredicate()); filter.add(new SupertypePredicate(SuperType.BASIC)); filter.add(Predicates.or( - new SubtypePredicate(SubType.PLAINS), - new SubtypePredicate(SubType.ISLAND), - new SubtypePredicate(SubType.SWAMP))); + SubType.PLAINS.getPredicate(), + SubType.ISLAND.getPredicate(), + SubType.SWAMP.getPredicate())); } public EsperPanorama(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EstridTheMasked.java b/Mage.Sets/src/mage/cards/e/EstridTheMasked.java index 25f0afb81c..6bde7c3faf 100644 --- a/Mage.Sets/src/mage/cards/e/EstridTheMasked.java +++ b/Mage.Sets/src/mage/cards/e/EstridTheMasked.java @@ -19,7 +19,6 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterEnchantmentCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.EnchantedPredicate; import mage.game.Game; @@ -123,8 +122,8 @@ class EstridTheMaskedGraveyardEffect extends OneShotEffect { = new FilterEnchantmentCard(); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.AURA))); - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(Predicates.not(SubType.AURA.getPredicate())); + filter.add(SubType.AURA.getPredicate()); } public EstridTheMaskedGraveyardEffect() { diff --git a/Mage.Sets/src/mage/cards/e/EternalFlame.java b/Mage.Sets/src/mage/cards/e/EternalFlame.java index 5942d62f7a..4aeb38a2b2 100644 --- a/Mage.Sets/src/mage/cards/e/EternalFlame.java +++ b/Mage.Sets/src/mage/cards/e/EternalFlame.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetOpponentOrPlaneswalker; /** @@ -23,7 +22,7 @@ public final class EternalFlame extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Mountains you control"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public EternalFlame(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EverbarkShaman.java b/Mage.Sets/src/mage/cards/e/EverbarkShaman.java index 094a274515..39d54caa59 100644 --- a/Mage.Sets/src/mage/cards/e/EverbarkShaman.java +++ b/Mage.Sets/src/mage/cards/e/EverbarkShaman.java @@ -15,7 +15,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetCardInYourGraveyard; @@ -29,8 +28,8 @@ public final class EverbarkShaman extends CardImpl { private static final FilterCard filterTreefolk = new FilterCard("Treefolk from your graveyard"); static { - filterForest.add(new SubtypePredicate(SubType.FOREST)); - filterTreefolk.add(new SubtypePredicate(SubType.TREEFOLK)); + filterForest.add(SubType.FOREST.getPredicate()); + filterTreefolk.add(SubType.TREEFOLK.getPredicate()); } public EverbarkShaman(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/Everglades.java b/Mage.Sets/src/mage/cards/e/Everglades.java index 8e2b3ceae0..668a5ffa3d 100644 --- a/Mage.Sets/src/mage/cards/e/Everglades.java +++ b/Mage.Sets/src/mage/cards/e/Everglades.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -29,7 +28,7 @@ public final class Everglades extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("an untapped Swamp"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/e/EvergloveCourier.java b/Mage.Sets/src/mage/cards/e/EvergloveCourier.java index 8a2772c989..4af97ab9cc 100644 --- a/Mage.Sets/src/mage/cards/e/EvergloveCourier.java +++ b/Mage.Sets/src/mage/cards/e/EvergloveCourier.java @@ -20,7 +20,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -32,7 +31,7 @@ public final class EvergloveCourier extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Elf creature"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public EvergloveCourier(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/Evershrike.java b/Mage.Sets/src/mage/cards/e/Evershrike.java index 0e404bf232..73c577c5e6 100644 --- a/Mage.Sets/src/mage/cards/e/Evershrike.java +++ b/Mage.Sets/src/mage/cards/e/Evershrike.java @@ -17,7 +17,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.other.AuraCardCanAttachToPermanentId; import mage.game.Game; import mage.game.permanent.Permanent; @@ -84,7 +83,7 @@ class EvershrikeEffect extends OneShotEffect { boolean exileSource = true; FilterCard filterAuraCard = new FilterCard("Aura card with converted mana cost X or less from your hand"); filterAuraCard.add(CardType.ENCHANTMENT.getPredicate()); - filterAuraCard.add(new SubtypePredicate(SubType.AURA)); + filterAuraCard.add(SubType.AURA.getPredicate()); filterAuraCard.add(new AuraCardCanAttachToPermanentId(evershrikePermanent.getId())); filterAuraCard.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, xAmount)); int count = controller.getHand().count(filterAuraCard, game); diff --git a/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java b/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java index 7e64fb1636..9d0b489c1a 100644 --- a/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java +++ b/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -25,8 +24,8 @@ public final class EvilEyeOfOrmsByGore extends CardImpl { private static final FilterCreaturePermanent cantBeBlockedByFilter = new FilterCreaturePermanent("except by Walls"); static { - cantBeBlockedByFilter.add(Predicates.not(new SubtypePredicate(SubType.WALL))); - cantAttackFilter.add(Predicates.not((new SubtypePredicate(SubType.EYE)))); + cantBeBlockedByFilter.add(Predicates.not(SubType.WALL.getPredicate())); + cantAttackFilter.add(Predicates.not((SubType.EYE.getPredicate()))); cantAttackFilter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java b/Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java index 8e415470c3..b716699642 100644 --- a/Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java +++ b/Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -24,7 +23,7 @@ public final class EvilEyeOfUrborg extends CardImpl { private static final FilterCreaturePermanent cantAttackFilter = new FilterCreaturePermanent("Non-Eye creatures you control"); static { - cantAttackFilter.add(Predicates.not((new SubtypePredicate(SubType.EYE)))); + cantAttackFilter.add(Predicates.not((SubType.EYE.getPredicate()))); cantAttackFilter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/e/Extinction.java b/Mage.Sets/src/mage/cards/e/Extinction.java index 27e3bc3be3..b1a5161d52 100644 --- a/Mage.Sets/src/mage/cards/e/Extinction.java +++ b/Mage.Sets/src/mage/cards/e/Extinction.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -61,7 +60,7 @@ class ExtinctionEffect extends OneShotEffect { if (player.choose(outcome, typeChoice, game)) { game.informPlayers(sourceObject.getLogName() + " chosen type: " + typeChoice.getChoice()); FilterCreaturePermanent filterCreaturePermanent = new FilterCreaturePermanent(); - filterCreaturePermanent.add(new SubtypePredicate(SubType.byDescription(typeChoice.getChoice()))); + filterCreaturePermanent.add(SubType.byDescription(typeChoice.getChoice()).getPredicate()); for (Permanent creature : game.getBattlefield().getActivePermanents(filterCreaturePermanent, source.getSourceId(), game)) { creature.destroy(source.getSourceId(), game, true); } diff --git a/Mage.Sets/src/mage/cards/e/ExtricatorOfFlesh.java b/Mage.Sets/src/mage/cards/e/ExtricatorOfFlesh.java index 60588e059f..d5786ada9e 100644 --- a/Mage.Sets/src/mage/cards/e/ExtricatorOfFlesh.java +++ b/Mage.Sets/src/mage/cards/e/ExtricatorOfFlesh.java @@ -20,7 +20,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.EldraziHorrorToken; import mage.target.common.TargetControlledCreaturePermanent; @@ -33,7 +32,7 @@ public final class ExtricatorOfFlesh extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("non-Eldrazi creature"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.ELDRAZI))); + filter.add(Predicates.not(SubType.ELDRAZI.getPredicate())); } public ExtricatorOfFlesh(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EyeOfUgin.java b/Mage.Sets/src/mage/cards/e/EyeOfUgin.java index 0fef45898f..5aa63ff887 100644 --- a/Mage.Sets/src/mage/cards/e/EyeOfUgin.java +++ b/Mage.Sets/src/mage/cards/e/EyeOfUgin.java @@ -19,7 +19,6 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.ColorlessPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -33,7 +32,7 @@ public final class EyeOfUgin extends CardImpl { static { filter.add(ColorlessPredicate.instance); filterSpells.add(ColorlessPredicate.instance); - filterSpells.add(new SubtypePredicate(SubType.ELDRAZI)); + filterSpells.add(SubType.ELDRAZI.getPredicate()); } public EyeOfUgin(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EyeblightMassacre.java b/Mage.Sets/src/mage/cards/e/EyeblightMassacre.java index 077b5507f1..4d401584f5 100644 --- a/Mage.Sets/src/mage/cards/e/EyeblightMassacre.java +++ b/Mage.Sets/src/mage/cards/e/EyeblightMassacre.java @@ -10,7 +10,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class EyeblightMassacre extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Non-Elf creatures"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.ELF))); + filter.add(Predicates.not(SubType.ELF.getPredicate())); } public EyeblightMassacre(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EyeblightsEnding.java b/Mage.Sets/src/mage/cards/e/EyeblightsEnding.java index 678910a40d..f182c4d897 100644 --- a/Mage.Sets/src/mage/cards/e/EyeblightsEnding.java +++ b/Mage.Sets/src/mage/cards/e/EyeblightsEnding.java @@ -9,7 +9,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -21,7 +20,7 @@ public final class EyeblightsEnding extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Elf creature"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.ELF))); + filter.add(Predicates.not(SubType.ELF.getPredicate())); } public EyeblightsEnding(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EzuriRenegadeLeader.java b/Mage.Sets/src/mage/cards/e/EzuriRenegadeLeader.java index d9e3ecb452..ac66109c65 100644 --- a/Mage.Sets/src/mage/cards/e/EzuriRenegadeLeader.java +++ b/Mage.Sets/src/mage/cards/e/EzuriRenegadeLeader.java @@ -17,7 +17,6 @@ import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -30,9 +29,9 @@ public final class EzuriRenegadeLeader extends CardImpl { private static final FilterControlledCreaturePermanent notEzuri = new FilterControlledCreaturePermanent(); static { - elfFilter.add(new SubtypePredicate(SubType.ELF)); + elfFilter.add(SubType.ELF.getPredicate()); - notEzuri.add(new SubtypePredicate(SubType.ELF)); + notEzuri.add(SubType.ELF.getPredicate()); notEzuri.add(Predicates.not(new NamePredicate("Ezuri, Renegade Leader"))); } diff --git a/Mage.Sets/src/mage/cards/f/Facevaulter.java b/Mage.Sets/src/mage/cards/f/Facevaulter.java index 4b6ec82016..2c0dff83fc 100644 --- a/Mage.Sets/src/mage/cards/f/Facevaulter.java +++ b/Mage.Sets/src/mage/cards/f/Facevaulter.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -24,7 +23,7 @@ public final class Facevaulter extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Goblin"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public Facevaulter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FaerieHarbinger.java b/Mage.Sets/src/mage/cards/f/FaerieHarbinger.java index b92376bc1a..29268f79a9 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieHarbinger.java +++ b/Mage.Sets/src/mage/cards/f/FaerieHarbinger.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -23,7 +22,7 @@ public final class FaerieHarbinger extends CardImpl { static final FilterCard filter = new FilterCard("Faerie card"); static { - filter.add(new SubtypePredicate(SubType.FAERIE)); + filter.add(SubType.FAERIE.getPredicate()); } public FaerieHarbinger(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FaerieNoble.java b/Mage.Sets/src/mage/cards/f/FaerieNoble.java index e9d6f52b52..d74e41d538 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieNoble.java +++ b/Mage.Sets/src/mage/cards/f/FaerieNoble.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -27,7 +26,7 @@ public final class FaerieNoble extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Faerie creatures"); static { - filter.add(new SubtypePredicate(SubType.FAERIE)); + filter.add(SubType.FAERIE.getPredicate()); } public FaerieNoble(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FaerieTrickery.java b/Mage.Sets/src/mage/cards/f/FaerieTrickery.java index ea82b8f9a3..3fde0f7c59 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieTrickery.java +++ b/Mage.Sets/src/mage/cards/f/FaerieTrickery.java @@ -10,7 +10,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetSpell; /** @@ -22,7 +21,7 @@ public final class FaerieTrickery extends CardImpl { private static final FilterSpell filter = new FilterSpell("non-Faerie spell"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.FAERIE))); + filter.add(Predicates.not(SubType.FAERIE.getPredicate())); } public FaerieTrickery(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FalkenrathGorger.java b/Mage.Sets/src/mage/cards/f/FalkenrathGorger.java index 5a9aac019f..d49f2e14a9 100644 --- a/Mage.Sets/src/mage/cards/f/FalkenrathGorger.java +++ b/Mage.Sets/src/mage/cards/f/FalkenrathGorger.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; @@ -62,7 +61,7 @@ class FalkenrathGorgerEffect extends ContinuousEffectImpl { private static final FilterCreatureCard filter = new FilterCreatureCard("Vampire creature card you own"); static { - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/f/FallenCleric.java b/Mage.Sets/src/mage/cards/f/FallenCleric.java index 7bd3bc0487..4a57604fa3 100644 --- a/Mage.Sets/src/mage/cards/f/FallenCleric.java +++ b/Mage.Sets/src/mage/cards/f/FallenCleric.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class FallenCleric extends CardImpl { private static final FilterCard filter = new FilterCard("Clerics"); static { - filter.add(new SubtypePredicate(SubType.CLERIC)); + filter.add(SubType.CLERIC.getPredicate()); } public FallenCleric(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/Farseek.java b/Mage.Sets/src/mage/cards/f/Farseek.java index d15f661fdf..69390e1ee1 100644 --- a/Mage.Sets/src/mage/cards/f/Farseek.java +++ b/Mage.Sets/src/mage/cards/f/Farseek.java @@ -10,7 +10,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -23,10 +22,10 @@ public final class Farseek extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.PLAINS), - new SubtypePredicate(SubType.ISLAND), - new SubtypePredicate(SubType.SWAMP), - new SubtypePredicate(SubType.MOUNTAIN))); + SubType.PLAINS.getPredicate(), + SubType.ISLAND.getPredicate(), + SubType.SWAMP.getPredicate(), + SubType.MOUNTAIN.getPredicate())); } public Farseek(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FathomFleetBoarder.java b/Mage.Sets/src/mage/cards/f/FathomFleetBoarder.java index c697a74221..06c53d153e 100644 --- a/Mage.Sets/src/mage/cards/f/FathomFleetBoarder.java +++ b/Mage.Sets/src/mage/cards/f/FathomFleetBoarder.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -25,7 +24,7 @@ public final class FathomFleetBoarder extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("you control another Pirate"); static { - filter.add(new SubtypePredicate(SubType.PIRATE)); + filter.add(SubType.PIRATE.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/f/FathomFleetCaptain.java b/Mage.Sets/src/mage/cards/f/FathomFleetCaptain.java index ba624da793..c1f6ad7ffb 100644 --- a/Mage.Sets/src/mage/cards/f/FathomFleetCaptain.java +++ b/Mage.Sets/src/mage/cards/f/FathomFleetCaptain.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.PirateToken; @@ -30,7 +29,7 @@ public final class FathomFleetCaptain extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("another nontoken Pirate"); static { - filter.add(new SubtypePredicate(SubType.PIRATE)); + filter.add(SubType.PIRATE.getPredicate()); filter.add(AnotherPredicate.instance); filter.add(Predicates.not(TokenPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/f/FathomSeer.java b/Mage.Sets/src/mage/cards/f/FathomSeer.java index 6a26227877..9ac99922c4 100644 --- a/Mage.Sets/src/mage/cards/f/FathomSeer.java +++ b/Mage.Sets/src/mage/cards/f/FathomSeer.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -24,7 +23,7 @@ public final class FathomSeer extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Islands"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } public FathomSeer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); diff --git a/Mage.Sets/src/mage/cards/f/FeedingFrenzy.java b/Mage.Sets/src/mage/cards/f/FeedingFrenzy.java index e47a16706b..2185823ad2 100644 --- a/Mage.Sets/src/mage/cards/f/FeedingFrenzy.java +++ b/Mage.Sets/src/mage/cards/f/FeedingFrenzy.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class FeedingFrenzy extends CardImpl { private static final FilterPermanent filter = new FilterPermanent(); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public FeedingFrenzy(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FelhideBrawler.java b/Mage.Sets/src/mage/cards/f/FelhideBrawler.java index 119599817e..aff2b1467a 100644 --- a/Mage.Sets/src/mage/cards/f/FelhideBrawler.java +++ b/Mage.Sets/src/mage/cards/f/FelhideBrawler.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -23,7 +22,7 @@ public final class FelhideBrawler extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("another Minotaur"); static { - filter.add(new SubtypePredicate(SubType.MINOTAUR)); + filter.add(SubType.MINOTAUR.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/f/FellFlagship.java b/Mage.Sets/src/mage/cards/f/FellFlagship.java index 0625432533..82cf9a3b45 100644 --- a/Mage.Sets/src/mage/cards/f/FellFlagship.java +++ b/Mage.Sets/src/mage/cards/f/FellFlagship.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class FellFlagship extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Pirates"); static { - filter.add(new SubtypePredicate(SubType.PIRATE)); + filter.add(SubType.PIRATE.getPredicate()); } public FellFlagship(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FendeepSummoner.java b/Mage.Sets/src/mage/cards/f/FendeepSummoner.java index cb87f96cbe..f22851077d 100644 --- a/Mage.Sets/src/mage/cards/f/FendeepSummoner.java +++ b/Mage.Sets/src/mage/cards/f/FendeepSummoner.java @@ -14,9 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.game.permanent.token.TokenImpl; -import mage.game.permanent.token.Token; import mage.game.permanent.token.custom.CreatureToken; import mage.target.common.TargetLandPermanent; import mage.util.SubTypeList; @@ -29,7 +26,7 @@ public final class FendeepSummoner extends CardImpl { static final FilterLandPermanent filter = new FilterLandPermanent("Swamp"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public FendeepSummoner(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FerocityOfTheWilds.java b/Mage.Sets/src/mage/cards/f/FerocityOfTheWilds.java index 43da88093b..0a0c9a3212 100644 --- a/Mage.Sets/src/mage/cards/f/FerocityOfTheWilds.java +++ b/Mage.Sets/src/mage/cards/f/FerocityOfTheWilds.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AttackingPredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -30,7 +29,7 @@ public final class FerocityOfTheWilds extends CardImpl { static { filter.add(AttackingPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(Predicates.not(new SubtypePredicate(SubType.HUMAN))); + filter.add(Predicates.not(SubType.HUMAN.getPredicate())); } public FerocityOfTheWilds(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FeverCharm.java b/Mage.Sets/src/mage/cards/f/FeverCharm.java index 155b3f2d57..139eaf431e 100644 --- a/Mage.Sets/src/mage/cards/f/FeverCharm.java +++ b/Mage.Sets/src/mage/cards/f/FeverCharm.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -25,7 +24,7 @@ public final class FeverCharm extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Wizard creature"); static { - filter.add(new SubtypePredicate(SubType.WIZARD)); + filter.add(SubType.WIZARD.getPredicate()); } public FeverCharm(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FieldMarshal.java b/Mage.Sets/src/mage/cards/f/FieldMarshal.java index db33f5193a..ecddba52ef 100644 --- a/Mage.Sets/src/mage/cards/f/FieldMarshal.java +++ b/Mage.Sets/src/mage/cards/f/FieldMarshal.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @author anonymous @@ -24,7 +23,7 @@ public final class FieldMarshal extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Soldier creatures"); static { - filter.add(new SubtypePredicate(SubType.SOLDIER)); + filter.add(SubType.SOLDIER.getPredicate()); } public FieldMarshal(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FiendOfTheShadows.java b/Mage.Sets/src/mage/cards/f/FiendOfTheShadows.java index f3f126c91b..b7d93c5b74 100644 --- a/Mage.Sets/src/mage/cards/f/FiendOfTheShadows.java +++ b/Mage.Sets/src/mage/cards/f/FiendOfTheShadows.java @@ -17,7 +17,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.ExileZone; import mage.game.Game; import mage.target.common.TargetControlledCreaturePermanent; @@ -33,7 +32,7 @@ public final class FiendOfTheShadows extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a Human"); static { - filter.add(new SubtypePredicate(SubType.HUMAN)); + filter.add(SubType.HUMAN.getPredicate()); } public FiendOfTheShadows(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FieryCannonade.java b/Mage.Sets/src/mage/cards/f/FieryCannonade.java index 951a68157d..c79d7f3240 100644 --- a/Mage.Sets/src/mage/cards/f/FieryCannonade.java +++ b/Mage.Sets/src/mage/cards/f/FieryCannonade.java @@ -9,7 +9,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -20,7 +19,7 @@ public final class FieryCannonade extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Pirate creature"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.PIRATE))); + filter.add(Predicates.not(SubType.PIRATE.getPredicate())); } public FieryCannonade(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FigureOfDestiny.java b/Mage.Sets/src/mage/cards/f/FigureOfDestiny.java index 6063b26427..b707de0208 100644 --- a/Mage.Sets/src/mage/cards/f/FigureOfDestiny.java +++ b/Mage.Sets/src/mage/cards/f/FigureOfDestiny.java @@ -18,9 +18,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.TokenImpl; -import mage.game.permanent.token.Token; /** * @@ -31,8 +29,8 @@ public final class FigureOfDestiny extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent(); private static final FilterCreaturePermanent filter3 = new FilterCreaturePermanent(); static { - filter2.add(new SubtypePredicate(SubType.SPIRIT)); - filter3.add(new SubtypePredicate(SubType.WARRIOR)); + filter2.add(SubType.SPIRIT.getPredicate()); + filter3.add(SubType.WARRIOR.getPredicate()); } public FigureOfDestiny(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/Filth.java b/Mage.Sets/src/mage/cards/f/Filth.java index e8b25598f5..694e25308d 100644 --- a/Mage.Sets/src/mage/cards/f/Filth.java +++ b/Mage.Sets/src/mage/cards/f/Filth.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -30,7 +29,7 @@ public final class Filth extends CardImpl { static { filter.add(CardType.LAND.getPredicate()); - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public Filth(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FinalIteration.java b/Mage.Sets/src/mage/cards/f/FinalIteration.java index 274ff435bb..418f4386e1 100644 --- a/Mage.Sets/src/mage/cards/f/FinalIteration.java +++ b/Mage.Sets/src/mage/cards/f/FinalIteration.java @@ -17,7 +17,6 @@ import mage.constants.*; import mage.filter.FilterSpell; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.HumanWizardToken; @@ -31,7 +30,7 @@ public final class FinalIteration extends CardImpl { private static final FilterSpell filterSpell = new FilterSpell("an instant or sorcery spell"); static { - filter.add(new SubtypePredicate(SubType.WIZARD)); + filter.add(SubType.WIZARD.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); filterSpell.add(Predicates.or( CardType.INSTANT.getPredicate(), diff --git a/Mage.Sets/src/mage/cards/f/FireDragon.java b/Mage.Sets/src/mage/cards/f/FireDragon.java index c7b18dbf53..81fbc205ca 100644 --- a/Mage.Sets/src/mage/cards/f/FireDragon.java +++ b/Mage.Sets/src/mage/cards/f/FireDragon.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -26,7 +25,7 @@ public final class FireDragon extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("for each Mountain you control"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public FireDragon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/Fireblast.java b/Mage.Sets/src/mage/cards/f/Fireblast.java index 7d15e0900b..a4b3015491 100644 --- a/Mage.Sets/src/mage/cards/f/Fireblast.java +++ b/Mage.Sets/src/mage/cards/f/Fireblast.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetAnyTarget; @@ -24,7 +23,7 @@ public final class Fireblast extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("two Mountains"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public Fireblast(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FirecatBlitz.java b/Mage.Sets/src/mage/cards/f/FirecatBlitz.java index 8ee0ae3c34..6af3a1caa0 100644 --- a/Mage.Sets/src/mage/cards/f/FirecatBlitz.java +++ b/Mage.Sets/src/mage/cards/f/FirecatBlitz.java @@ -16,7 +16,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.ElementalCatToken; @@ -32,7 +31,7 @@ public final class FirecatBlitz extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("Mountains"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public FirecatBlitz(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FirefistAdept.java b/Mage.Sets/src/mage/cards/f/FirefistAdept.java index 0081b72b72..75a946ac17 100644 --- a/Mage.Sets/src/mage/cards/f/FirefistAdept.java +++ b/Mage.Sets/src/mage/cards/f/FirefistAdept.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetOpponentsCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class FirefistAdept extends CardImpl { private static final FilterControlledCreaturePermanent filterCount = new FilterControlledCreaturePermanent("Wizards you control"); static { - filterCount.add(new SubtypePredicate(SubType.WIZARD)); + filterCount.add(SubType.WIZARD.getPredicate()); } public FirefistAdept(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FirewakeSliver.java b/Mage.Sets/src/mage/cards/f/FirewakeSliver.java index 753bdb4eda..c90f7421f7 100644 --- a/Mage.Sets/src/mage/cards/f/FirewakeSliver.java +++ b/Mage.Sets/src/mage/cards/f/FirewakeSliver.java @@ -18,7 +18,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -31,8 +30,8 @@ public final class FirewakeSliver extends CardImpl { private static final FilterCreaturePermanent targetSliverFilter = new FilterCreaturePermanent("Sliver"); static { - filter.add(new SubtypePredicate(SubType.SLIVER)); - targetSliverFilter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); + targetSliverFilter.add(SubType.SLIVER.getPredicate()); } public FirewakeSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FlagstonesOfTrokair.java b/Mage.Sets/src/mage/cards/f/FlagstonesOfTrokair.java index 522d33e117..b5112fec13 100644 --- a/Mage.Sets/src/mage/cards/f/FlagstonesOfTrokair.java +++ b/Mage.Sets/src/mage/cards/f/FlagstonesOfTrokair.java @@ -9,7 +9,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterLandCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; import java.util.UUID; @@ -22,7 +21,7 @@ public final class FlagstonesOfTrokair extends CardImpl { private static final FilterLandCard FILTER = new FilterLandCard("Plains card"); static { - FILTER.add(new SubtypePredicate(SubType.PLAINS)); + FILTER.add(SubType.PLAINS.getPredicate()); } public FlagstonesOfTrokair(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FlameTrooper.java b/Mage.Sets/src/mage/cards/f/FlameTrooper.java index 1dd4adb8db..2faa9c07c8 100644 --- a/Mage.Sets/src/mage/cards/f/FlameTrooper.java +++ b/Mage.Sets/src/mage/cards/f/FlameTrooper.java @@ -4,7 +4,6 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; -import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.MenaceAbility; import mage.constants.Duration; import mage.constants.SubType; @@ -13,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +22,7 @@ public final class FlameTrooper extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Trooper creatures"); static { - filter.add(new SubtypePredicate(SubType.TROOPER)); + filter.add(SubType.TROOPER.getPredicate()); } public FlameTrooper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FlamekinBladewhirl.java b/Mage.Sets/src/mage/cards/f/FlamekinBladewhirl.java index 6b087e535d..0cca34ba6c 100644 --- a/Mage.Sets/src/mage/cards/f/FlamekinBladewhirl.java +++ b/Mage.Sets/src/mage/cards/f/FlamekinBladewhirl.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; /** @@ -22,7 +21,7 @@ public final class FlamekinBladewhirl extends CardImpl { private static final FilterCard filter = new FilterCard("an Elemental card from your hand"); static { - filter.add(new SubtypePredicate(SubType.ELEMENTAL)); + filter.add(SubType.ELEMENTAL.getPredicate()); } public FlamekinBladewhirl(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FlamekinHarbinger.java b/Mage.Sets/src/mage/cards/f/FlamekinHarbinger.java index 15dd5cc00d..4f902616b9 100644 --- a/Mage.Sets/src/mage/cards/f/FlamekinHarbinger.java +++ b/Mage.Sets/src/mage/cards/f/FlamekinHarbinger.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -22,7 +21,7 @@ public final class FlamekinHarbinger extends CardImpl { private static final FilterCard filter = new FilterCard("Elemental card"); static { - filter.add(new SubtypePredicate(SubType.ELEMENTAL)); + filter.add(SubType.ELEMENTAL.getPredicate()); } public FlamekinHarbinger(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FlamekinVillage.java b/Mage.Sets/src/mage/cards/f/FlamekinVillage.java index 587463c492..948b3be37c 100644 --- a/Mage.Sets/src/mage/cards/f/FlamekinVillage.java +++ b/Mage.Sets/src/mage/cards/f/FlamekinVillage.java @@ -18,7 +18,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; import mage.target.common.TargetCreaturePermanent; @@ -31,7 +30,7 @@ public final class FlamekinVillage extends CardImpl { private static final FilterCard filter = new FilterCard("an Elemental card from your hand"); static { - filter.add(new SubtypePredicate(SubType.ELEMENTAL)); + filter.add(SubType.ELEMENTAL.getPredicate()); } public FlamekinVillage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/Flameshot.java b/Mage.Sets/src/mage/cards/f/Flameshot.java index f5b4215a51..605e13fdb4 100644 --- a/Mage.Sets/src/mage/cards/f/Flameshot.java +++ b/Mage.Sets/src/mage/cards/f/Flameshot.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; import mage.target.common.TargetCreaturePermanentAmount; @@ -23,7 +22,7 @@ public final class Flameshot extends CardImpl { private static final FilterCard filter = new FilterCard("a Mountain card"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public Flameshot(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FlamestickCourier.java b/Mage.Sets/src/mage/cards/f/FlamestickCourier.java index c4d473190e..60bc9643a5 100644 --- a/Mage.Sets/src/mage/cards/f/FlamestickCourier.java +++ b/Mage.Sets/src/mage/cards/f/FlamestickCourier.java @@ -20,7 +20,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -32,7 +31,7 @@ public final class FlamestickCourier extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Goblin creature"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public FlamestickCourier(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FlashFlood.java b/Mage.Sets/src/mage/cards/f/FlashFlood.java index 7a5ab5d8ec..3994c72ec2 100644 --- a/Mage.Sets/src/mage/cards/f/FlashFlood.java +++ b/Mage.Sets/src/mage/cards/f/FlashFlood.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -26,7 +25,7 @@ public final class FlashFlood extends CardImpl { static { filter1.add(new ColorPredicate(ObjectColor.RED)); - filter2.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter2.add(SubType.MOUNTAIN.getPredicate()); } public FlashFlood(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/Flashfires.java b/Mage.Sets/src/mage/cards/f/Flashfires.java index 014a0e6008..4feef1555a 100644 --- a/Mage.Sets/src/mage/cards/f/Flashfires.java +++ b/Mage.Sets/src/mage/cards/f/Flashfires.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -19,7 +18,7 @@ public final class Flashfires extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Plains"); static{ - filter.add(new SubtypePredicate(SubType.PLAINS)); + filter.add(SubType.PLAINS.getPredicate()); } public Flashfires(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FleetingMemories.java b/Mage.Sets/src/mage/cards/f/FleetingMemories.java index 1fb25d58a8..b74845671f 100644 --- a/Mage.Sets/src/mage/cards/f/FleetingMemories.java +++ b/Mage.Sets/src/mage/cards/f/FleetingMemories.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -28,7 +27,7 @@ public final class FleetingMemories extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Clue"); static { - filter.add(new SubtypePredicate(SubType.CLUE)); + filter.add(SubType.CLUE.getPredicate()); } public FleetingMemories(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/Flickerform.java b/Mage.Sets/src/mage/cards/f/Flickerform.java index c3db832f67..5f800a0b6a 100644 --- a/Mage.Sets/src/mage/cards/f/Flickerform.java +++ b/Mage.Sets/src/mage/cards/f/Flickerform.java @@ -21,7 +21,6 @@ import mage.constants.Zone; import mage.filter.Filter; import mage.filter.FilterCard; import mage.filter.common.FilterEnchantmentPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.ExileZone; import mage.game.Game; import mage.game.permanent.Permanent; @@ -67,7 +66,7 @@ class FlickerformEffect extends OneShotEffect { private static final FilterEnchantmentPermanent filter = new FilterEnchantmentPermanent(); static { - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); } public FlickerformEffect() { @@ -123,7 +122,7 @@ class FlickerformReturnEffect extends OneShotEffect { static { filterAura.add(CardType.ENCHANTMENT.getPredicate()); - filterAura.add(new SubtypePredicate(SubType.AURA)); + filterAura.add(SubType.AURA.getPredicate()); } private final UUID enchantedCardId; diff --git a/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java b/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java index db5d3043c6..7df66d6874 100644 --- a/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java +++ b/Mage.Sets/src/mage/cards/f/FlinthoofBoar.java @@ -16,7 +16,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -27,7 +26,7 @@ public final class FlinthoofBoar extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Mountain"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public FlinthoofBoar(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FloodedShoreline.java b/Mage.Sets/src/mage/cards/f/FloodedShoreline.java index 5804d27c42..36e66b9069 100644 --- a/Mage.Sets/src/mage/cards/f/FloodedShoreline.java +++ b/Mage.Sets/src/mage/cards/f/FloodedShoreline.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -26,7 +25,7 @@ public final class FloodedShoreline extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Islands"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } public FloodedShoreline(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/Floodgate.java b/Mage.Sets/src/mage/cards/f/Floodgate.java index 378bc3c70b..7ec5cdc5ca 100644 --- a/Mage.Sets/src/mage/cards/f/Floodgate.java +++ b/Mage.Sets/src/mage/cards/f/Floodgate.java @@ -50,7 +50,6 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -127,7 +126,7 @@ class FloodgateDamageEffect extends OneShotEffect { static { filter.add(Predicates.not(new ColorPredicate(ObjectColor.BLUE))); filter.add(Predicates.not(new AbilityPredicate(FlyingAbility.class))); - filter2.add(new SubtypePredicate(SubType.ISLAND)); + filter2.add(SubType.ISLAND.getPredicate()); } public FloodgateDamageEffect() { diff --git a/Mage.Sets/src/mage/cards/f/FlowOfIdeas.java b/Mage.Sets/src/mage/cards/f/FlowOfIdeas.java index 01026cb10e..00e382d19d 100644 --- a/Mage.Sets/src/mage/cards/f/FlowOfIdeas.java +++ b/Mage.Sets/src/mage/cards/f/FlowOfIdeas.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -20,7 +19,7 @@ public final class FlowOfIdeas extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Island you control"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } public FlowOfIdeas(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FlowOfMaggots.java b/Mage.Sets/src/mage/cards/f/FlowOfMaggots.java index c732e5c090..8358648be7 100644 --- a/Mage.Sets/src/mage/cards/f/FlowOfMaggots.java +++ b/Mage.Sets/src/mage/cards/f/FlowOfMaggots.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -25,7 +24,7 @@ public final class FlowOfMaggots extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Wall creatures"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.WALL))); + filter.add(Predicates.not(SubType.WALL.getPredicate())); } public FlowOfMaggots(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FlowerFlourish.java b/Mage.Sets/src/mage/cards/f/FlowerFlourish.java index 47df1408bc..78d730682b 100644 --- a/Mage.Sets/src/mage/cards/f/FlowerFlourish.java +++ b/Mage.Sets/src/mage/cards/f/FlowerFlourish.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; @@ -28,8 +27,8 @@ public final class FlowerFlourish extends SplitCard { static { filter.add(new SupertypePredicate(SuperType.BASIC)); filter.add(Predicates.or( - new SubtypePredicate(SubType.FOREST), - new SubtypePredicate(SubType.PLAINS) + SubType.FOREST.getPredicate(), + SubType.PLAINS.getPredicate() )); } diff --git a/Mage.Sets/src/mage/cards/f/Foil.java b/Mage.Sets/src/mage/cards/f/Foil.java index 2288255397..e58584f365 100644 --- a/Mage.Sets/src/mage/cards/f/Foil.java +++ b/Mage.Sets/src/mage/cards/f/Foil.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetSpell; import mage.target.common.TargetCardInHand; @@ -23,7 +22,7 @@ public final class Foil extends CardImpl { private static final FilterCard filter = new FilterCard("an Island card"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } public Foil(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FoothillGuide.java b/Mage.Sets/src/mage/cards/f/FoothillGuide.java index 953c3f3170..d41555bd16 100644 --- a/Mage.Sets/src/mage/cards/f/FoothillGuide.java +++ b/Mage.Sets/src/mage/cards/f/FoothillGuide.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class FoothillGuide extends CardImpl { private static final FilterCard filter = new FilterCard("Goblins"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public FoothillGuide(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/Foratog.java b/Mage.Sets/src/mage/cards/f/Foratog.java index 40101154d7..4f868ca096 100644 --- a/Mage.Sets/src/mage/cards/f/Foratog.java +++ b/Mage.Sets/src/mage/cards/f/Foratog.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -26,7 +25,7 @@ public final class Foratog extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("a Forest"); static{ - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public Foratog(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); diff --git a/Mage.Sets/src/mage/cards/f/ForebodingRuins.java b/Mage.Sets/src/mage/cards/f/ForebodingRuins.java index 4d97f8a268..336d7b7345 100644 --- a/Mage.Sets/src/mage/cards/f/ForebodingRuins.java +++ b/Mage.Sets/src/mage/cards/f/ForebodingRuins.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; /** @@ -25,8 +24,8 @@ public final class ForebodingRuins extends CardImpl { private static final FilterCard filter = new FilterCard("a Swamp or Mountain card from your hand"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.SWAMP), - new SubtypePredicate(SubType.MOUNTAIN))); + filter.add(Predicates.or(SubType.SWAMP.getPredicate(), + SubType.MOUNTAIN.getPredicate())); } public ForebodingRuins(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FortifiedArea.java b/Mage.Sets/src/mage/cards/f/FortifiedArea.java index 62accde3eb..aea00dc043 100644 --- a/Mage.Sets/src/mage/cards/f/FortifiedArea.java +++ b/Mage.Sets/src/mage/cards/f/FortifiedArea.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class FortifiedArea extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Wall creatures"); static { - filter.add(new SubtypePredicate(SubType.WALL)); + filter.add(SubType.WALL.getPredicate()); } public FortifiedArea(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FortifiedVillage.java b/Mage.Sets/src/mage/cards/f/FortifiedVillage.java index c7f6eb70fb..856fed7b3d 100644 --- a/Mage.Sets/src/mage/cards/f/FortifiedVillage.java +++ b/Mage.Sets/src/mage/cards/f/FortifiedVillage.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; /** @@ -25,8 +24,8 @@ public final class FortifiedVillage extends CardImpl { private static final FilterCard filter = new FilterCard("a Forest or Plains card from your hand"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.FOREST), - new SubtypePredicate(SubType.PLAINS))); + filter.add(Predicates.or(SubType.FOREST.getPredicate(), + SubType.PLAINS.getPredicate())); } public FortifiedVillage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/Fortitude.java b/Mage.Sets/src/mage/cards/f/Fortitude.java index 0ad4bd4b83..49c8e62f18 100644 --- a/Mage.Sets/src/mage/cards/f/Fortitude.java +++ b/Mage.Sets/src/mage/cards/f/Fortitude.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -28,7 +27,7 @@ public final class Fortitude extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Forest"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public Fortitude(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FoulTongueInvocation.java b/Mage.Sets/src/mage/cards/f/FoulTongueInvocation.java index cb2a1d7d70..73cce4a48c 100644 --- a/Mage.Sets/src/mage/cards/f/FoulTongueInvocation.java +++ b/Mage.Sets/src/mage/cards/f/FoulTongueInvocation.java @@ -14,7 +14,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.StaticFilters; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; @@ -57,7 +56,7 @@ enum FoulTongueInvocationAdjuster implements CostAdjuster { private static final FilterCard filter = new FilterCard("a Dragon card from your hand (you don't have to)"); static { - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } @Override diff --git a/Mage.Sets/src/mage/cards/f/FrenzySliver.java b/Mage.Sets/src/mage/cards/f/FrenzySliver.java index 331fed13b5..5f3772a05a 100644 --- a/Mage.Sets/src/mage/cards/f/FrenzySliver.java +++ b/Mage.Sets/src/mage/cards/f/FrenzySliver.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.combat.CombatGroup; import mage.game.events.GameEvent; @@ -32,8 +31,8 @@ public final class FrenzySliver extends CardImpl { private static final FilterCreaturePermanent targetSliverFilter = new FilterCreaturePermanent("Sliver"); static { - filter.add(new SubtypePredicate(SubType.SLIVER)); - targetSliverFilter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); + targetSliverFilter.add(SubType.SLIVER.getPredicate()); } public FrenzySliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FrightshroudCourier.java b/Mage.Sets/src/mage/cards/f/FrightshroudCourier.java index 737d3ac271..735832e096 100644 --- a/Mage.Sets/src/mage/cards/f/FrightshroudCourier.java +++ b/Mage.Sets/src/mage/cards/f/FrightshroudCourier.java @@ -20,7 +20,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -32,7 +31,7 @@ public final class FrightshroudCourier extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Zombie creature"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public FrightshroudCourier(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FrogtosserBanneret.java b/Mage.Sets/src/mage/cards/f/FrogtosserBanneret.java index b442c0baad..886577ba81 100644 --- a/Mage.Sets/src/mage/cards/f/FrogtosserBanneret.java +++ b/Mage.Sets/src/mage/cards/f/FrogtosserBanneret.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -25,8 +24,8 @@ public final class FrogtosserBanneret extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.GOBLIN), - new SubtypePredicate(SubType.ROGUE))); + SubType.GOBLIN.getPredicate(), + SubType.ROGUE.getPredicate())); } public FrogtosserBanneret(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FromBeyond.java b/Mage.Sets/src/mage/cards/f/FromBeyond.java index 17138f1752..d0ea07022d 100644 --- a/Mage.Sets/src/mage/cards/f/FromBeyond.java +++ b/Mage.Sets/src/mage/cards/f/FromBeyond.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.EldraziScionToken; import mage.target.common.TargetCardInLibrary; @@ -30,7 +29,7 @@ public final class FromBeyond extends CardImpl { private static final FilterCard filter = new FilterCard("Eldrazi card"); static { - filter.add(new SubtypePredicate(SubType.ELDRAZI)); + filter.add(SubType.ELDRAZI.getPredicate()); } public FromBeyond(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FrontlineStrategist.java b/Mage.Sets/src/mage/cards/f/FrontlineStrategist.java index 3208d5943c..7e291ca79f 100644 --- a/Mage.Sets/src/mage/cards/f/FrontlineStrategist.java +++ b/Mage.Sets/src/mage/cards/f/FrontlineStrategist.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -25,7 +24,7 @@ public final class FrontlineStrategist extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Soldier creatures"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.SOLDIER))); + filter.add(Predicates.not(SubType.SOLDIER.getPredicate())); } public FrontlineStrategist(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/Fruition.java b/Mage.Sets/src/mage/cards/f/Fruition.java index 45bc450068..fc7e973c0c 100644 --- a/Mage.Sets/src/mage/cards/f/Fruition.java +++ b/Mage.Sets/src/mage/cards/f/Fruition.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -20,7 +19,7 @@ public final class Fruition extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("for each Forest on the battlefield"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public Fruition(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FugitiveDruid.java b/Mage.Sets/src/mage/cards/f/FugitiveDruid.java index 0b3aca8465..9e764e875a 100644 --- a/Mage.Sets/src/mage/cards/f/FugitiveDruid.java +++ b/Mage.Sets/src/mage/cards/f/FugitiveDruid.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -21,7 +20,7 @@ public final class FugitiveDruid extends CardImpl { private static final FilterSpell filter = new FilterSpell("an Aura spell"); static { - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); } public FugitiveDruid(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FulfillContract.java b/Mage.Sets/src/mage/cards/f/FulfillContract.java index 4425c0bd07..6f0fd24382 100644 --- a/Mage.Sets/src/mage/cards/f/FulfillContract.java +++ b/Mage.Sets/src/mage/cards/f/FulfillContract.java @@ -13,7 +13,6 @@ import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.CounterPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -32,7 +31,7 @@ public final class FulfillContract extends CardImpl { static { filterBountyCreature.add(new CounterPredicate(CounterType.BOUNTY)); - filterRogueOrHunter.add(Predicates.or(new SubtypePredicate(SubType.ROGUE), new SubtypePredicate(SubType.HUNTER))); + filterRogueOrHunter.add(Predicates.or(SubType.ROGUE.getPredicate(), SubType.HUNTER.getPredicate())); } public FulfillContract(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FullMoonsRise.java b/Mage.Sets/src/mage/cards/f/FullMoonsRise.java index 3a256edb0a..c1c0c06ebb 100644 --- a/Mage.Sets/src/mage/cards/f/FullMoonsRise.java +++ b/Mage.Sets/src/mage/cards/f/FullMoonsRise.java @@ -18,7 +18,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; @@ -31,7 +30,7 @@ public final class FullMoonsRise extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Werewolf creatures"); static { - filter.add(new SubtypePredicate(SubType.WEREWOLF)); + filter.add(SubType.WEREWOLF.getPredicate()); } public FullMoonsRise(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FungalBloom.java b/Mage.Sets/src/mage/cards/f/FungalBloom.java index d3f6b369d8..cd6f22f9b0 100644 --- a/Mage.Sets/src/mage/cards/f/FungalBloom.java +++ b/Mage.Sets/src/mage/cards/f/FungalBloom.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -25,7 +24,7 @@ public final class FungalBloom extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Fungus"); static { - filter.add(new SubtypePredicate(SubType.FUNGUS)); + filter.add(SubType.FUNGUS.getPredicate()); } public FungalBloom(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FungalPlots.java b/Mage.Sets/src/mage/cards/f/FungalPlots.java index 3204192576..9b0100e6b2 100644 --- a/Mage.Sets/src/mage/cards/f/FungalPlots.java +++ b/Mage.Sets/src/mage/cards/f/FungalPlots.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SaprolingToken; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetControlledPermanent; @@ -31,7 +30,7 @@ public final class FungalPlots extends CardImpl { private static final FilterControlledPermanent filter2 = new FilterControlledPermanent("two Saprolings"); static { - filter2.add(new SubtypePredicate(SubType.SAPROLING)); + filter2.add(SubType.SAPROLING.getPredicate()); } public FungalPlots(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FungusElemental.java b/Mage.Sets/src/mage/cards/f/FungusElemental.java index ae134e8794..409bfa4ffd 100644 --- a/Mage.Sets/src/mage/cards/f/FungusElemental.java +++ b/Mage.Sets/src/mage/cards/f/FungusElemental.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledPermanent; @@ -29,7 +28,7 @@ public final class FungusElemental extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Forest"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public FungusElemental(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FungusSliver.java b/Mage.Sets/src/mage/cards/f/FungusSliver.java index a34c9e52b1..e0ccfd6784 100644 --- a/Mage.Sets/src/mage/cards/f/FungusSliver.java +++ b/Mage.Sets/src/mage/cards/f/FungusSliver.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -25,7 +24,7 @@ public final class FungusSliver extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); } public FungusSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GaeasBalance.java b/Mage.Sets/src/mage/cards/g/GaeasBalance.java index 178cdcee8f..58d20cabd3 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasBalance.java +++ b/Mage.Sets/src/mage/cards/g/GaeasBalance.java @@ -14,7 +14,6 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.filter.common.FilterLandCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; @@ -60,11 +59,11 @@ class GaeasBalanceEffect extends OneShotEffect { private static final FilterCard forestFilter = new FilterLandCard("a Forest land card"); static { - plainsFilter.add(new SubtypePredicate(SubType.PLAINS)); - islandFilter.add(new SubtypePredicate(SubType.ISLAND)); - swampFilter.add(new SubtypePredicate(SubType.SWAMP)); - mountainFilter.add(new SubtypePredicate(SubType.MOUNTAIN)); - forestFilter.add(new SubtypePredicate(SubType.FOREST)); + plainsFilter.add(SubType.PLAINS.getPredicate()); + islandFilter.add(SubType.ISLAND.getPredicate()); + swampFilter.add(SubType.SWAMP.getPredicate()); + mountainFilter.add(SubType.MOUNTAIN.getPredicate()); + forestFilter.add(SubType.FOREST.getPredicate()); } private static final List filterList = Arrays.asList( diff --git a/Mage.Sets/src/mage/cards/g/GaeasBounty.java b/Mage.Sets/src/mage/cards/g/GaeasBounty.java index c449ccfe11..da78847f7c 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasBounty.java +++ b/Mage.Sets/src/mage/cards/g/GaeasBounty.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterLandCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -20,7 +19,7 @@ public final class GaeasBounty extends CardImpl { private static final FilterLandCard filter = new FilterLandCard("Forest"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public GaeasBounty(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GaeasLiege.java b/Mage.Sets/src/mage/cards/g/GaeasLiege.java index 99c8c30d33..4959c9a893 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasLiege.java +++ b/Mage.Sets/src/mage/cards/g/GaeasLiege.java @@ -22,7 +22,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.combat.CombatGroup; import mage.game.permanent.Permanent; @@ -37,7 +36,7 @@ public final class GaeasLiege extends CardImpl { static final FilterControlledPermanent filterLands = new FilterControlledPermanent("Forests you control"); static { - filterLands.add(new SubtypePredicate(SubType.FOREST)); + filterLands.add(SubType.FOREST.getPredicate()); } public GaeasLiege(UUID ownerId, CardSetInfo setInfo) { @@ -84,7 +83,7 @@ class DefendersForestCount implements DynamicValue { } FilterLandPermanent filter = new FilterLandPermanent("forest"); - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); return game.getBattlefield().countAll(filter, defenderId, game); } diff --git a/Mage.Sets/src/mage/cards/g/GaeasTouch.java b/Mage.Sets/src/mage/cards/g/GaeasTouch.java index 8d7b86e800..16577c9405 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasTouch.java +++ b/Mage.Sets/src/mage/cards/g/GaeasTouch.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; /** @@ -27,7 +26,7 @@ public final class GaeasTouch extends CardImpl { // You may put a basic Forest card from your hand onto the battlefield. Activate this ability only any time you could cast a sorcery and only once each turn. FilterCard filter = new FilterCard("basic Forest card"); filter.add(new SupertypePredicate(SuperType.BASIC)); - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); LimitedTimesPerTurnActivatedAbility ability = new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(filter), new GenericManaCost(0), 1); ability.setTiming(TimingRule.SORCERY); diff --git a/Mage.Sets/src/mage/cards/g/GalecasterColossus.java b/Mage.Sets/src/mage/cards/g/GalecasterColossus.java index 9c00fb80e7..f3d31bf214 100644 --- a/Mage.Sets/src/mage/cards/g/GalecasterColossus.java +++ b/Mage.Sets/src/mage/cards/g/GalecasterColossus.java @@ -16,7 +16,6 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterNonlandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -33,7 +32,7 @@ public final class GalecasterColossus extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.NOT_YOU)); - filter2.add(new SubtypePredicate(SubType.WIZARD)); + filter2.add(SubType.WIZARD.getPredicate()); filter2.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/g/GallowsAtWillowHill.java b/Mage.Sets/src/mage/cards/g/GallowsAtWillowHill.java index c7ce35b44f..a6734cc9f8 100644 --- a/Mage.Sets/src/mage/cards/g/GallowsAtWillowHill.java +++ b/Mage.Sets/src/mage/cards/g/GallowsAtWillowHill.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -36,7 +35,7 @@ public final class GallowsAtWillowHill extends CardImpl { static { humanFilter.add(Predicates.not(TappedPredicate.instance)); - humanFilter.add(new SubtypePredicate(SubType.HUMAN)); + humanFilter.add(SubType.HUMAN.getPredicate()); } public GallowsAtWillowHill(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GallowsWarden.java b/Mage.Sets/src/mage/cards/g/GallowsWarden.java index ea12222893..fc0deef8e7 100644 --- a/Mage.Sets/src/mage/cards/g/GallowsWarden.java +++ b/Mage.Sets/src/mage/cards/g/GallowsWarden.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @author nantuko @@ -23,7 +22,7 @@ public final class GallowsWarden extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Spirit creatures"); static { - filter.add(new SubtypePredicate(SubType.SPIRIT)); + filter.add(SubType.SPIRIT.getPredicate()); } public GallowsWarden(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GameTrail.java b/Mage.Sets/src/mage/cards/g/GameTrail.java index edeffd6e5d..fc784db2c3 100644 --- a/Mage.Sets/src/mage/cards/g/GameTrail.java +++ b/Mage.Sets/src/mage/cards/g/GameTrail.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; /** @@ -25,8 +24,8 @@ public final class GameTrail extends CardImpl { private static final FilterCard filter = new FilterCard("a Mountain or Forest card from your hand"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.MOUNTAIN), - new SubtypePredicate(SubType.FOREST))); + filter.add(Predicates.or(SubType.MOUNTAIN.getPredicate(), + SubType.FOREST.getPredicate())); } public GameTrail(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GangrenousGoliath.java b/Mage.Sets/src/mage/cards/g/GangrenousGoliath.java index 5b085e8edc..9c778d8f40 100644 --- a/Mage.Sets/src/mage/cards/g/GangrenousGoliath.java +++ b/Mage.Sets/src/mage/cards/g/GangrenousGoliath.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class GangrenousGoliath extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Clerics"); static { - filter.add(new SubtypePredicate(SubType.CLERIC)); + filter.add(SubType.CLERIC.getPredicate()); } public GangrenousGoliath(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GangrenousZombies.java b/Mage.Sets/src/mage/cards/g/GangrenousZombies.java index 17fca38a81..3021158433 100644 --- a/Mage.Sets/src/mage/cards/g/GangrenousZombies.java +++ b/Mage.Sets/src/mage/cards/g/GangrenousZombies.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import java.util.UUID; @@ -31,7 +30,7 @@ public final class GangrenousZombies extends CardImpl { static { filter.add(new SupertypePredicate(SuperType.SNOW)); - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public GangrenousZombies(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GargantuanGorilla.java b/Mage.Sets/src/mage/cards/g/GargantuanGorilla.java index 066f250a6b..72bd1170fb 100644 --- a/Mage.Sets/src/mage/cards/g/GargantuanGorilla.java +++ b/Mage.Sets/src/mage/cards/g/GargantuanGorilla.java @@ -16,7 +16,6 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; @@ -65,7 +64,7 @@ class GargantuanGorillaSacrificeEffect extends OneShotEffect { private static final FilterPermanent filterSnow = new FilterPermanent("snow permanent"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); filterSnow.add(new SupertypePredicate(SuperType.SNOW)); } diff --git a/Mage.Sets/src/mage/cards/g/GargosViciousWatcher.java b/Mage.Sets/src/mage/cards/g/GargosViciousWatcher.java index 7419c7568a..1089f6b5ed 100644 --- a/Mage.Sets/src/mage/cards/g/GargosViciousWatcher.java +++ b/Mage.Sets/src/mage/cards/g/GargosViciousWatcher.java @@ -13,7 +13,6 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -30,7 +29,7 @@ public final class GargosViciousWatcher extends CardImpl { private static final FilterCard filter = new FilterCard("Hydra spells"); static { - filter.add(new SubtypePredicate(SubType.HYDRA)); + filter.add(SubType.HYDRA.getPredicate()); } public GargosViciousWatcher(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GarrisonSergeant.java b/Mage.Sets/src/mage/cards/g/GarrisonSergeant.java index 5a2c7738f1..a48f2f0a7d 100644 --- a/Mage.Sets/src/mage/cards/g/GarrisonSergeant.java +++ b/Mage.Sets/src/mage/cards/g/GarrisonSergeant.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class GarrisonSergeant extends CardImpl { private static final FilterPermanent filter = new FilterControlledPermanent(); static { - filter.add(new SubtypePredicate(SubType.GATE)); + filter.add(SubType.GATE.getPredicate()); } public GarrisonSergeant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GateColossus.java b/Mage.Sets/src/mage/cards/g/GateColossus.java index 633370862b..42420c65f4 100644 --- a/Mage.Sets/src/mage/cards/g/GateColossus.java +++ b/Mage.Sets/src/mage/cards/g/GateColossus.java @@ -15,7 +15,6 @@ import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.util.CardUtil; @@ -70,7 +69,7 @@ class GateColossusCostReductionEffect extends CostModificationEffectImpl { static final FilterControlledPermanent filter = new FilterControlledPermanent("a Gate"); static { - filter.add(new SubtypePredicate(SubType.GATE)); + filter.add(SubType.GATE.getPredicate()); } public GateColossusCostReductionEffect() { diff --git a/Mage.Sets/src/mage/cards/g/GatebreakerRam.java b/Mage.Sets/src/mage/cards/g/GatebreakerRam.java index 8ef7e9738b..bcb422f859 100644 --- a/Mage.Sets/src/mage/cards/g/GatebreakerRam.java +++ b/Mage.Sets/src/mage/cards/g/GatebreakerRam.java @@ -21,7 +21,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -33,7 +32,7 @@ public final class GatebreakerRam extends CardImpl { private static final FilterPermanent filter = new FilterControlledPermanent(); static { - filter.add(new SubtypePredicate(SubType.GATE)); + filter.add(SubType.GATE.getPredicate()); } private static final DynamicValue xValue diff --git a/Mage.Sets/src/mage/cards/g/GatecreeperVine.java b/Mage.Sets/src/mage/cards/g/GatecreeperVine.java index 68cdee8f37..70138c00c4 100644 --- a/Mage.Sets/src/mage/cards/g/GatecreeperVine.java +++ b/Mage.Sets/src/mage/cards/g/GatecreeperVine.java @@ -13,7 +13,6 @@ import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; @@ -32,7 +31,7 @@ public final class GatecreeperVine extends CardImpl { Predicates.and( CardType.LAND.getPredicate(), new SupertypePredicate(SuperType.BASIC)), - new SubtypePredicate(SubType.GATE))); + SubType.GATE.getPredicate())); } public GatecreeperVine(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GatesAblaze.java b/Mage.Sets/src/mage/cards/g/GatesAblaze.java index 780aa83f1a..50d06102cc 100644 --- a/Mage.Sets/src/mage/cards/g/GatesAblaze.java +++ b/Mage.Sets/src/mage/cards/g/GatesAblaze.java @@ -10,7 +10,6 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -23,7 +22,7 @@ public final class GatesAblaze extends CardImpl { = new FilterControlledPermanent("the number of Gates you control"); static { - filter.add(new SubtypePredicate(SubType.GATE)); + filter.add(SubType.GATE.getPredicate()); } private static final DynamicValue xValue = new PermanentsOnBattlefieldCount(filter); diff --git a/Mage.Sets/src/mage/cards/g/GatewayShade.java b/Mage.Sets/src/mage/cards/g/GatewayShade.java index cb36365322..62bc6954b4 100644 --- a/Mage.Sets/src/mage/cards/g/GatewayShade.java +++ b/Mage.Sets/src/mage/cards/g/GatewayShade.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -27,7 +26,7 @@ public final class GatewayShade extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("untapped Gate you control"); static { - filter.add(new SubtypePredicate(SubType.GATE)); + filter.add(SubType.GATE.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/g/GathererOfGraces.java b/Mage.Sets/src/mage/cards/g/GathererOfGraces.java index 7708b0aadf..1f3e858b03 100644 --- a/Mage.Sets/src/mage/cards/g/GathererOfGraces.java +++ b/Mage.Sets/src/mage/cards/g/GathererOfGraces.java @@ -16,7 +16,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -28,7 +27,7 @@ public final class GathererOfGraces extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("an Aura"); static { - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); } public GathererOfGraces(UUID ownerId, CardSetInfo cardSetInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GauntletOfMight.java b/Mage.Sets/src/mage/cards/g/GauntletOfMight.java index 240ab94821..fc08e8bb92 100644 --- a/Mage.Sets/src/mage/cards/g/GauntletOfMight.java +++ b/Mage.Sets/src/mage/cards/g/GauntletOfMight.java @@ -15,7 +15,6 @@ import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -28,7 +27,7 @@ public final class GauntletOfMight extends CardImpl { static { filter.add(new ColorPredicate(ObjectColor.RED)); - filterMountain.add(new SubtypePredicate(SubType.MOUNTAIN)); + filterMountain.add(SubType.MOUNTAIN.getPredicate()); } public GauntletOfMight(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GemOfBecoming.java b/Mage.Sets/src/mage/cards/g/GemOfBecoming.java index 64e607e0f8..fba4d34f87 100644 --- a/Mage.Sets/src/mage/cards/g/GemOfBecoming.java +++ b/Mage.Sets/src/mage/cards/g/GemOfBecoming.java @@ -14,7 +14,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; @@ -83,7 +82,7 @@ class GemOfBecomingEffect extends OneShotEffect { private void searchLand(Player player, Ability source, Game game, Cards cards, String subtype) { FilterLandCard filter = new FilterLandCard(subtype); - filter.add(new SubtypePredicate(SubType.byDescription(subtype))); + filter.add(SubType.byDescription(subtype).getPredicate()); TargetCardInLibrary target = new TargetCardInLibrary(filter); if (player.searchLibrary(target, source, game)) { Card card = player.getLibrary().remove(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/g/GempalmAvenger.java b/Mage.Sets/src/mage/cards/g/GempalmAvenger.java index 848f602df0..58d1a90e83 100644 --- a/Mage.Sets/src/mage/cards/g/GempalmAvenger.java +++ b/Mage.Sets/src/mage/cards/g/GempalmAvenger.java @@ -17,7 +17,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -28,7 +27,7 @@ public final class GempalmAvenger extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Soldier creatures"); static { - filter.add(new SubtypePredicate(SubType.SOLDIER)); + filter.add(SubType.SOLDIER.getPredicate()); } public GempalmAvenger(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GempalmIncinerator.java b/Mage.Sets/src/mage/cards/g/GempalmIncinerator.java index c44207d6aa..39cd7f046f 100644 --- a/Mage.Sets/src/mage/cards/g/GempalmIncinerator.java +++ b/Mage.Sets/src/mage/cards/g/GempalmIncinerator.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -25,7 +24,7 @@ public final class GempalmIncinerator extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Goblins on the battlefield"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public GempalmIncinerator(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GempalmPolluter.java b/Mage.Sets/src/mage/cards/g/GempalmPolluter.java index 3ab7cb2074..3390f280fd 100644 --- a/Mage.Sets/src/mage/cards/g/GempalmPolluter.java +++ b/Mage.Sets/src/mage/cards/g/GempalmPolluter.java @@ -15,7 +15,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPlayer; /** @@ -27,7 +26,7 @@ public final class GempalmPolluter extends CardImpl { static final private FilterPermanent filter = new FilterPermanent("Zombie"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public GempalmPolluter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GempalmSorcerer.java b/Mage.Sets/src/mage/cards/g/GempalmSorcerer.java index af4c5a22cb..498b15e553 100644 --- a/Mage.Sets/src/mage/cards/g/GempalmSorcerer.java +++ b/Mage.Sets/src/mage/cards/g/GempalmSorcerer.java @@ -15,7 +15,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class GempalmSorcerer extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Wizard creatures"); static { - filter.add(new SubtypePredicate(SubType.WIZARD)); + filter.add(SubType.WIZARD.getPredicate()); } public GempalmSorcerer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GempalmStrider.java b/Mage.Sets/src/mage/cards/g/GempalmStrider.java index 1d26119859..30d863ce04 100644 --- a/Mage.Sets/src/mage/cards/g/GempalmStrider.java +++ b/Mage.Sets/src/mage/cards/g/GempalmStrider.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class GempalmStrider extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Elf creatures"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public GempalmStrider(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GeneralTazri.java b/Mage.Sets/src/mage/cards/g/GeneralTazri.java index 013d1bd919..3cccac98e5 100644 --- a/Mage.Sets/src/mage/cards/g/GeneralTazri.java +++ b/Mage.Sets/src/mage/cards/g/GeneralTazri.java @@ -17,7 +17,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCardInLibrary; @@ -31,7 +30,7 @@ public final class GeneralTazri extends CardImpl { private static final FilterCreatureCard filter = new FilterCreatureCard("an Ally creature card"); static { - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); } public GeneralTazri(UUID ownerId, CardSetInfo setInfo) { @@ -71,7 +70,7 @@ class GeneralTazriColorCount implements DynamicValue { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new SubtypePredicate((SubType.ALLY))); + filter.add(SubType.ALLY.getPredicate()); } @Override diff --git a/Mage.Sets/src/mage/cards/g/GhituJourneymage.java b/Mage.Sets/src/mage/cards/g/GhituJourneymage.java index 8075d92fd9..8936dc1ed3 100644 --- a/Mage.Sets/src/mage/cards/g/GhituJourneymage.java +++ b/Mage.Sets/src/mage/cards/g/GhituJourneymage.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -27,7 +26,7 @@ public final class GhituJourneymage extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new SubtypePredicate(SubType.WIZARD)); + filter.add(SubType.WIZARD.getPredicate()); } public GhituJourneymage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GhosthelmCourier.java b/Mage.Sets/src/mage/cards/g/GhosthelmCourier.java index e5589080a6..414fde694b 100644 --- a/Mage.Sets/src/mage/cards/g/GhosthelmCourier.java +++ b/Mage.Sets/src/mage/cards/g/GhosthelmCourier.java @@ -20,7 +20,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -32,7 +31,7 @@ public final class GhosthelmCourier extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Wizard creature"); static { - filter.add(new SubtypePredicate(SubType.WIZARD)); + filter.add(SubType.WIZARD.getPredicate()); } public GhosthelmCourier(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GhoulcallersChant.java b/Mage.Sets/src/mage/cards/g/GhoulcallersChant.java index 7489c01982..80ff7e8fd8 100644 --- a/Mage.Sets/src/mage/cards/g/GhoulcallersChant.java +++ b/Mage.Sets/src/mage/cards/g/GhoulcallersChant.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.StaticFilters; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInYourGraveyard; /** @@ -22,7 +21,7 @@ public final class GhoulcallersChant extends CardImpl { private static final FilterCard filter = new FilterCard("Zombie cards from your graveyard"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public GhoulcallersChant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/Ghoulraiser.java b/Mage.Sets/src/mage/cards/g/Ghoulraiser.java index e7cd2399a3..4e39980c85 100644 --- a/Mage.Sets/src/mage/cards/g/Ghoulraiser.java +++ b/Mage.Sets/src/mage/cards/g/Ghoulraiser.java @@ -14,7 +14,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.util.RandomUtil; @@ -67,7 +66,7 @@ class GhoulraiserEffect extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); if (player != null) { FilterCard filter = new FilterCard("Zombie card"); - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); Card[] cards = player.getGraveyard().getCards(filter, game).toArray(new Card[0]); if (cards.length > 0) { Card card = cards[RandomUtil.nextInt(cards.length)]; diff --git a/Mage.Sets/src/mage/cards/g/GiantHarbinger.java b/Mage.Sets/src/mage/cards/g/GiantHarbinger.java index e19d975dc4..81bbfb02b7 100644 --- a/Mage.Sets/src/mage/cards/g/GiantHarbinger.java +++ b/Mage.Sets/src/mage/cards/g/GiantHarbinger.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -21,7 +20,7 @@ public final class GiantHarbinger extends CardImpl { static final FilterCard filter = new FilterCard("Giant card"); static { - filter.add(new SubtypePredicate(SubType.GIANT)); + filter.add(SubType.GIANT.getPredicate()); } public GiantHarbinger(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GiantShark.java b/Mage.Sets/src/mage/cards/g/GiantShark.java index 4ddc091776..20feb429e6 100644 --- a/Mage.Sets/src/mage/cards/g/GiantShark.java +++ b/Mage.Sets/src/mage/cards/g/GiantShark.java @@ -21,7 +21,6 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.WasDealtDamageThisTurnPredicate; /** @@ -35,7 +34,7 @@ public final class GiantShark extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("creature that has been dealt damage this turn"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); filter2.add(new WasDealtDamageThisTurnPredicate()); } diff --git a/Mage.Sets/src/mage/cards/g/GiantSlug.java b/Mage.Sets/src/mage/cards/g/GiantSlug.java index 8cfc8d42f3..fcc832dda8 100644 --- a/Mage.Sets/src/mage/cards/g/GiantSlug.java +++ b/Mage.Sets/src/mage/cards/g/GiantSlug.java @@ -21,7 +21,6 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -80,19 +79,19 @@ class GiantSlugEffect extends OneShotEffect { game.informPlayers(sourcePermanent.getName() + ": Chosen basic land type is " + choices.getChoice()); FilterLandPermanent filter = new FilterLandPermanent(choices.getChoice()); if (choices.getChoice().equals("Plains")) { - filter.add(new SubtypePredicate(SubType.PLAINS)); + filter.add(SubType.PLAINS.getPredicate()); } if (choices.getChoice().equals("Island")) { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } if (choices.getChoice().equals("Swamp")) { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } if (choices.getChoice().equals("Mountain")) { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } if (choices.getChoice().equals("Forest")) { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } Ability landwalkAbility = new LandwalkAbility(filter); game.addEffect(new GainAbilitySourceEffect(landwalkAbility, Duration.EndOfTurn, false), source); diff --git a/Mage.Sets/src/mage/cards/g/GiantsIre.java b/Mage.Sets/src/mage/cards/g/GiantsIre.java index 0911ad24c2..0d802bd3cc 100644 --- a/Mage.Sets/src/mage/cards/g/GiantsIre.java +++ b/Mage.Sets/src/mage/cards/g/GiantsIre.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetPlayerOrPlaneswalker; /** @@ -23,7 +22,7 @@ public final class GiantsIre extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Giant"); static { - filter.add(new SubtypePredicate(SubType.GIANT)); + filter.add(SubType.GIANT.getPredicate()); } public GiantsIre(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GiftOfEstates.java b/Mage.Sets/src/mage/cards/g/GiftOfEstates.java index 16ea709ff1..948a55d017 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfEstates.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfEstates.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.StaticFilters; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -23,7 +22,7 @@ public final class GiftOfEstates extends CardImpl { private static final FilterCard filter = new FilterCard("Plains cards"); static { - filter.add(new SubtypePredicate(SubType.PLAINS)); + filter.add(SubType.PLAINS.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/g/GildedCerodon.java b/Mage.Sets/src/mage/cards/g/GildedCerodon.java index f89e51e141..e561fd4890 100644 --- a/Mage.Sets/src/mage/cards/g/GildedCerodon.java +++ b/Mage.Sets/src/mage/cards/g/GildedCerodon.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; @@ -58,8 +57,8 @@ class GildedCerodonCondition implements Condition { private static final FilterCard filter2 = new FilterCard(); static { - filter.add(new SubtypePredicate(SubType.DESERT)); - filter2.add(new SubtypePredicate(SubType.DESERT)); + filter.add(SubType.DESERT.getPredicate()); + filter2.add(SubType.DESERT.getPredicate()); } @Override diff --git a/Mage.Sets/src/mage/cards/g/GildedGoose.java b/Mage.Sets/src/mage/cards/g/GildedGoose.java index d45b5dafb7..d5b63887b2 100644 --- a/Mage.Sets/src/mage/cards/g/GildedGoose.java +++ b/Mage.Sets/src/mage/cards/g/GildedGoose.java @@ -17,7 +17,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.FoodToken; import mage.target.common.TargetControlledPermanent; @@ -32,7 +31,7 @@ public final class GildedGoose extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Food"); static { - filter.add(new SubtypePredicate(SubType.FOOD)); + filter.add(SubType.FOOD.getPredicate()); } public GildedGoose(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GiltLeafArchdruid.java b/Mage.Sets/src/mage/cards/g/GiltLeafArchdruid.java index 2254334ea8..bc7344d2a6 100644 --- a/Mage.Sets/src/mage/cards/g/GiltLeafArchdruid.java +++ b/Mage.Sets/src/mage/cards/g/GiltLeafArchdruid.java @@ -17,7 +17,6 @@ import mage.constants.*; import mage.filter.FilterSpell; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -34,7 +33,7 @@ public final class GiltLeafArchdruid extends CardImpl { private static final FilterSpell filterSpell = new FilterSpell("a Druid spell"); static { - filterSpell.add(new SubtypePredicate(SubType.DRUID)); + filterSpell.add(SubType.DRUID.getPredicate()); } public GiltLeafArchdruid(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GiltLeafPalace.java b/Mage.Sets/src/mage/cards/g/GiltLeafPalace.java index df969d5da4..fecfacbff7 100644 --- a/Mage.Sets/src/mage/cards/g/GiltLeafPalace.java +++ b/Mage.Sets/src/mage/cards/g/GiltLeafPalace.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; /** @@ -23,7 +22,7 @@ public final class GiltLeafPalace extends CardImpl { private static final FilterCard filter = new FilterCard("a Elf from your hand"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public GiltLeafPalace(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GiltLeafWinnower.java b/Mage.Sets/src/mage/cards/g/GiltLeafWinnower.java index 3395c5e64b..81989efe12 100644 --- a/Mage.Sets/src/mage/cards/g/GiltLeafWinnower.java +++ b/Mage.Sets/src/mage/cards/g/GiltLeafWinnower.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.target.common.TargetCreaturePermanent; @@ -28,7 +27,7 @@ public final class GiltLeafWinnower extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Elf creature whose power and toughness aren't equal"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.ELF))); + filter.add(Predicates.not(SubType.ELF.getPredicate())); filter.add(new PowerToughnessNotEqualPredicate()); } diff --git a/Mage.Sets/src/mage/cards/g/GisaAndGeralf.java b/Mage.Sets/src/mage/cards/g/GisaAndGeralf.java index 22a8b29021..eb23546083 100644 --- a/Mage.Sets/src/mage/cards/g/GisaAndGeralf.java +++ b/Mage.Sets/src/mage/cards/g/GisaAndGeralf.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.Spell; @@ -60,7 +59,7 @@ class GisaAndGeralfContinuousEffect extends ContinuousEffectImpl { private static final FilterCreatureCard filter = new FilterCreatureCard("Zombie creature card"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } GisaAndGeralfContinuousEffect() { diff --git a/Mage.Sets/src/mage/cards/g/GishathSunsAvatar.java b/Mage.Sets/src/mage/cards/g/GishathSunsAvatar.java index 1107db0197..bd328bdcd0 100644 --- a/Mage.Sets/src/mage/cards/g/GishathSunsAvatar.java +++ b/Mage.Sets/src/mage/cards/g/GishathSunsAvatar.java @@ -19,7 +19,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; @@ -89,7 +88,7 @@ class GishathSunsAvatarEffect extends OneShotEffect { if (!cards.isEmpty()) { controller.revealCards(source, cards, game); FilterCreatureCard filter = new FilterCreatureCard("Dinosaur creature cards"); - filter.add(new SubtypePredicate(SubType.DINOSAUR)); + filter.add(SubType.DINOSAUR.getPredicate()); TargetCard target1 = new TargetCard(0, Integer.MAX_VALUE, Zone.LIBRARY, filter); target1.setNotTarget(true); controller.choose(Outcome.PutCardInPlay, cards, target1, game); diff --git a/Mage.Sets/src/mage/cards/g/GlacialCrasher.java b/Mage.Sets/src/mage/cards/g/GlacialCrasher.java index ba066a828b..b1153b8b60 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialCrasher.java +++ b/Mage.Sets/src/mage/cards/g/GlacialCrasher.java @@ -12,7 +12,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -51,7 +50,7 @@ class GlacialCrasherEffect extends RestrictionEffect { private static final FilterLandPermanent filter = new FilterLandPermanent("Mountain"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public GlacialCrasherEffect() { diff --git a/Mage.Sets/src/mage/cards/g/GlacialCrevasses.java b/Mage.Sets/src/mage/cards/g/GlacialCrevasses.java index 3a3bff3756..7750a3786c 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialCrevasses.java +++ b/Mage.Sets/src/mage/cards/g/GlacialCrevasses.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetControlledPermanent; @@ -24,7 +23,7 @@ public final class GlacialCrevasses extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("a snow Mountain"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); filter.add(new SupertypePredicate(SuperType.SNOW)); } diff --git a/Mage.Sets/src/mage/cards/g/GlacialFortress.java b/Mage.Sets/src/mage/cards/g/GlacialFortress.java index 38433fa222..0011266208 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialFortress.java +++ b/Mage.Sets/src/mage/cards/g/GlacialFortress.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -28,7 +27,7 @@ public final class GlacialFortress extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.PLAINS), new SubtypePredicate(SubType.ISLAND))); + filter.add(Predicates.or(SubType.PLAINS.getPredicate(), SubType.ISLAND.getPredicate())); } public GlacialFortress(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/Glimmerpost.java b/Mage.Sets/src/mage/cards/g/Glimmerpost.java index fc012065b7..82a56d59f2 100644 --- a/Mage.Sets/src/mage/cards/g/Glimmerpost.java +++ b/Mage.Sets/src/mage/cards/g/Glimmerpost.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; @@ -50,7 +49,7 @@ class GlimmerpostEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterPermanent(); static { - filter.add(new SubtypePredicate(SubType.LOCUS)); + filter.add(SubType.LOCUS.getPredicate()); } public GlimmerpostEffect() { diff --git a/Mage.Sets/src/mage/cards/g/GlobalRuin.java b/Mage.Sets/src/mage/cards/g/GlobalRuin.java index c69fd8d545..c734ff3c27 100644 --- a/Mage.Sets/src/mage/cards/g/GlobalRuin.java +++ b/Mage.Sets/src/mage/cards/g/GlobalRuin.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.SubTypeSet; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -70,7 +69,7 @@ class GlobalRuinDestroyLandEffect extends OneShotEffect { if(player != null) { for (SubType landName : Arrays.stream(SubType.values()).filter(p -> p.getSubTypeSet() == SubTypeSet.BasicLandType).collect(Collectors.toSet())) { FilterControlledLandPermanent filter = new FilterControlledLandPermanent(landName + " you control"); - filter.add(new SubtypePredicate(landName)); + filter.add(landName.getPredicate()); Target target = new TargetControlledPermanent(1, 1, filter, true); if (target.canChoose(player.getId(), game)) { player.chooseTarget(outcome, target, source, game); diff --git a/Mage.Sets/src/mage/cards/g/Glorybringer.java b/Mage.Sets/src/mage/cards/g/Glorybringer.java index 5260991354..73084bb905 100644 --- a/Mage.Sets/src/mage/cards/g/Glorybringer.java +++ b/Mage.Sets/src/mage/cards/g/Glorybringer.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -29,7 +28,7 @@ public final class Glorybringer extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Dragon creature an opponent controls"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.DRAGON))); + filter.add(Predicates.not(SubType.DRAGON.getPredicate())); filter.add(new ControllerPredicate(TargetController.OPPONENT)); } diff --git a/Mage.Sets/src/mage/cards/g/GlyphOfDelusion.java b/Mage.Sets/src/mage/cards/g/GlyphOfDelusion.java index d2f000570b..36b8934bd8 100644 --- a/Mage.Sets/src/mage/cards/g/GlyphOfDelusion.java +++ b/Mage.Sets/src/mage/cards/g/GlyphOfDelusion.java @@ -17,7 +17,6 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -37,7 +36,7 @@ public final class GlyphOfDelusion extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Wall creature"); static { - filter.add(new SubtypePredicate(SubType.WALL)); + filter.add(SubType.WALL.getPredicate()); } public GlyphOfDelusion(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GlyphOfDestruction.java b/Mage.Sets/src/mage/cards/g/GlyphOfDestruction.java index 016c25f35a..5362ef33c0 100644 --- a/Mage.Sets/src/mage/cards/g/GlyphOfDestruction.java +++ b/Mage.Sets/src/mage/cards/g/GlyphOfDestruction.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.BlockingPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -24,7 +23,7 @@ public final class GlyphOfDestruction extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("blocking Wall you control"); static { - filter.add(new SubtypePredicate(SubType.WALL)); + filter.add(SubType.WALL.getPredicate()); filter.add(BlockingPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/g/GlyphOfDoom.java b/Mage.Sets/src/mage/cards/g/GlyphOfDoom.java index 5862096bd5..a2f16c838d 100644 --- a/Mage.Sets/src/mage/cards/g/GlyphOfDoom.java +++ b/Mage.Sets/src/mage/cards/g/GlyphOfDoom.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Outcome; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -32,7 +31,7 @@ public final class GlyphOfDoom extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Wall creature"); static { - filter.add(new SubtypePredicate(SubType.WALL)); + filter.add(SubType.WALL.getPredicate()); } public GlyphOfDoom(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GlyphOfLife.java b/Mage.Sets/src/mage/cards/g/GlyphOfLife.java index 7b9b24945e..133c933294 100644 --- a/Mage.Sets/src/mage/cards/g/GlyphOfLife.java +++ b/Mage.Sets/src/mage/cards/g/GlyphOfLife.java @@ -13,9 +13,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Outcome; -import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.DamagedCreatureEvent; @@ -33,7 +31,7 @@ public final class GlyphOfLife extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Wall creature"); static { - filter.add(new SubtypePredicate(SubType.WALL)); + filter.add(SubType.WALL.getPredicate()); } public GlyphOfLife(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GlyphOfReincarnation.java b/Mage.Sets/src/mage/cards/g/GlyphOfReincarnation.java index c8dda0c62a..349ab923be 100644 --- a/Mage.Sets/src/mage/cards/g/GlyphOfReincarnation.java +++ b/Mage.Sets/src/mage/cards/g/GlyphOfReincarnation.java @@ -15,7 +15,6 @@ import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.other.OwnerIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -37,7 +36,7 @@ public final class GlyphOfReincarnation extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Wall creature"); static { - filter.add(new SubtypePredicate(SubType.WALL)); + filter.add(SubType.WALL.getPredicate()); } public GlyphOfReincarnation(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GnarlrootTrapper.java b/Mage.Sets/src/mage/cards/g/GnarlrootTrapper.java index be62dc9f0f..b4fdf4328f 100644 --- a/Mage.Sets/src/mage/cards/g/GnarlrootTrapper.java +++ b/Mage.Sets/src/mage/cards/g/GnarlrootTrapper.java @@ -22,7 +22,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AttackingPredicate; import mage.game.Game; import mage.target.common.TargetControlledCreaturePermanent; @@ -39,7 +38,7 @@ public final class GnarlrootTrapper extends CardImpl { static { filter.add(AttackingPredicate.instance); - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public GnarlrootTrapper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/Goatnapper.java b/Mage.Sets/src/mage/cards/g/Goatnapper.java index 11c0ba7d9b..24875fc747 100644 --- a/Mage.Sets/src/mage/cards/g/Goatnapper.java +++ b/Mage.Sets/src/mage/cards/g/Goatnapper.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -27,7 +26,7 @@ public final class Goatnapper extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Goat"); static { - filter.add(new SubtypePredicate(SubType.GOAT)); + filter.add(SubType.GOAT.getPredicate()); } public Goatnapper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinBarrage.java b/Mage.Sets/src/mage/cards/g/GoblinBarrage.java index 37342d5329..366e8cf1c3 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBarrage.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBarrage.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -31,7 +30,7 @@ public final class GoblinBarrage extends CardImpl { static { filter.add(Predicates.or( CardType.ARTIFACT.getPredicate(), - new SubtypePredicate(SubType.GOBLIN) + SubType.GOBLIN.getPredicate() )); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinBurrows.java b/Mage.Sets/src/mage/cards/g/GoblinBurrows.java index cb9d5fad92..7aca7c12ad 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBurrows.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBurrows.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -27,7 +26,7 @@ public final class GoblinBurrows extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Goblin creature"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public GoblinBurrows(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinClearcutter.java b/Mage.Sets/src/mage/cards/g/GoblinClearcutter.java index a3a75dc6e7..3c412f5315 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinClearcutter.java +++ b/Mage.Sets/src/mage/cards/g/GoblinClearcutter.java @@ -20,7 +20,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetControlledPermanent; @@ -33,7 +32,7 @@ public final class GoblinClearcutter extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Forest"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public GoblinClearcutter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinDiggingTeam.java b/Mage.Sets/src/mage/cards/g/GoblinDiggingTeam.java index 1a420d065d..de76d48bd5 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinDiggingTeam.java +++ b/Mage.Sets/src/mage/cards/g/GoblinDiggingTeam.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -25,7 +24,7 @@ public final class GoblinDiggingTeam extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Wall"); static { - filter.add(new SubtypePredicate(SubType.WALL)); + filter.add(SubType.WALL.getPredicate()); } public GoblinDiggingTeam(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinGrenade.java b/Mage.Sets/src/mage/cards/g/GoblinGrenade.java index 058f235310..2956e97497 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinGrenade.java +++ b/Mage.Sets/src/mage/cards/g/GoblinGrenade.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetAnyTarget; @@ -21,7 +20,7 @@ public final class GoblinGrenade extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Goblin"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public GoblinGrenade(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinLackey.java b/Mage.Sets/src/mage/cards/g/GoblinLackey.java index 0e5c44498e..59c751c025 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinLackey.java +++ b/Mage.Sets/src/mage/cards/g/GoblinLackey.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -21,7 +20,7 @@ public final class GoblinLackey extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("a Goblin permanent card"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public GoblinLackey(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinLookout.java b/Mage.Sets/src/mage/cards/g/GoblinLookout.java index 2b329441a9..fe0f6327a9 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinLookout.java +++ b/Mage.Sets/src/mage/cards/g/GoblinLookout.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -28,7 +27,7 @@ public final class GoblinLookout extends CardImpl { private static final FilterControlledPermanent filterPermanent = new FilterControlledPermanent("a Goblin"); static { - filterPermanent.add(new SubtypePredicate(SubType.GOBLIN)); + filterPermanent.add(SubType.GOBLIN.getPredicate()); } public GoblinLookout(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinMasons.java b/Mage.Sets/src/mage/cards/g/GoblinMasons.java index 2d90c48175..7d6fff4100 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinMasons.java +++ b/Mage.Sets/src/mage/cards/g/GoblinMasons.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -22,7 +21,7 @@ public final class GoblinMasons extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Wall"); static { - filter.add(new SubtypePredicate(SubType.WALL)); + filter.add(SubType.WALL.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinMatron.java b/Mage.Sets/src/mage/cards/g/GoblinMatron.java index 45dfb52723..a5a8c9c8b6 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinMatron.java +++ b/Mage.Sets/src/mage/cards/g/GoblinMatron.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -22,7 +21,7 @@ public final class GoblinMatron extends CardImpl { private static final FilterCard filter = new FilterCard("Goblin card"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public GoblinMatron(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinPiledriver.java b/Mage.Sets/src/mage/cards/g/GoblinPiledriver.java index 3aacc2532a..fefac781ca 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinPiledriver.java +++ b/Mage.Sets/src/mage/cards/g/GoblinPiledriver.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -27,7 +26,7 @@ public final class GoblinPiledriver extends CardImpl { private static final FilterAttackingCreature filter = new FilterAttackingCreature("other attacking Goblin"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinPyromancer.java b/Mage.Sets/src/mage/cards/g/GoblinPyromancer.java index b2b58ef7e6..5e9f1a7642 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinPyromancer.java +++ b/Mage.Sets/src/mage/cards/g/GoblinPyromancer.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class GoblinPyromancer extends CardImpl { private static final FilterPermanent filterPermanent = new FilterPermanent("Goblins"); static { - filterPermanent.add(new SubtypePredicate(SubType.GOBLIN)); + filterPermanent.add(SubType.GOBLIN.getPredicate()); } public GoblinPyromancer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinRecruiter.java b/Mage.Sets/src/mage/cards/g/GoblinRecruiter.java index b3943e7ad9..9b27229034 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinRecruiter.java +++ b/Mage.Sets/src/mage/cards/g/GoblinRecruiter.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** @@ -22,7 +21,7 @@ public final class GoblinRecruiter extends CardImpl { private static final FilterCard filter = new FilterCard("Goblin cards"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public GoblinRecruiter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinRingleader.java b/Mage.Sets/src/mage/cards/g/GoblinRingleader.java index 21a3611966..bb482e90d3 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinRingleader.java +++ b/Mage.Sets/src/mage/cards/g/GoblinRingleader.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -23,7 +22,7 @@ public final class GoblinRingleader extends CardImpl { private static final FilterCard filter = new FilterCard("Goblin cards"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public GoblinRingleader(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinRockSled.java b/Mage.Sets/src/mage/cards/g/GoblinRockSled.java index 6c3defd224..35ab2426fc 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinRockSled.java +++ b/Mage.Sets/src/mage/cards/g/GoblinRockSled.java @@ -19,7 +19,6 @@ import mage.constants.PhaseStep; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -35,7 +34,7 @@ public final class GoblinRockSled extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("a Mountain"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public GoblinRockSled(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinShrine.java b/Mage.Sets/src/mage/cards/g/GoblinShrine.java index 212ea394d1..816c2ef290 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinShrine.java +++ b/Mage.Sets/src/mage/cards/g/GoblinShrine.java @@ -20,7 +20,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -36,7 +35,7 @@ public final class GoblinShrine extends CardImpl { private static final String rule = "As long as enchanted land is a basic Mountain, Goblin creatures get +1/+0."; static { - filterGoblin.add(new SubtypePredicate(SubType.GOBLIN)); + filterGoblin.add(SubType.GOBLIN.getPredicate()); } public GoblinShrine(UUID ownerId, CardSetInfo setInfo) { @@ -75,7 +74,7 @@ class EnchantedPermanentSubtypeCondition implements Condition { private final FilterLandPermanent filter = new FilterLandPermanent(); public EnchantedPermanentSubtypeCondition(SubType subType) { - filter.add(new SubtypePredicate(subType)); + filter.add(subType.getPredicate()); } @Override diff --git a/Mage.Sets/src/mage/cards/g/GoblinSledder.java b/Mage.Sets/src/mage/cards/g/GoblinSledder.java index 972cc7560e..5a1b560f4d 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSledder.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSledder.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; @@ -27,7 +26,7 @@ public final class GoblinSledder extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a Goblin"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public GoblinSledder(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinSoothsayer.java b/Mage.Sets/src/mage/cards/g/GoblinSoothsayer.java index e8d9df335d..cc054c3dfd 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSoothsayer.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSoothsayer.java @@ -19,7 +19,6 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -33,7 +32,7 @@ public final class GoblinSoothsayer extends CardImpl { static { filter.add(new ColorPredicate(ObjectColor.RED)); - filter2.add(new SubtypePredicate(SubType.GOBLIN)); + filter2.add(SubType.GOBLIN.getPredicate()); } public GoblinSoothsayer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinTaskmaster.java b/Mage.Sets/src/mage/cards/g/GoblinTaskmaster.java index 5f236ae5a5..633568b67c 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinTaskmaster.java +++ b/Mage.Sets/src/mage/cards/g/GoblinTaskmaster.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -27,7 +26,7 @@ public final class GoblinTaskmaster extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Goblin creature"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public GoblinTaskmaster(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinTurncoat.java b/Mage.Sets/src/mage/cards/g/GoblinTurncoat.java index 06104830b6..33e45b652d 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinTurncoat.java +++ b/Mage.Sets/src/mage/cards/g/GoblinTurncoat.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -25,7 +24,7 @@ public final class GoblinTurncoat extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a Goblin"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public GoblinTurncoat(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinWarStrike.java b/Mage.Sets/src/mage/cards/g/GoblinWarStrike.java index 4b1fbd4360..8b654ff967 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWarStrike.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWarStrike.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetPlayerOrPlaneswalker; @@ -23,7 +22,7 @@ public final class GoblinWarStrike extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Goblins you control"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinWarchief.java b/Mage.Sets/src/mage/cards/g/GoblinWarchief.java index 6abda7aa24..13106e9ba2 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWarchief.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWarchief.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class GoblinWarchief extends CardImpl { private static final FilterCard filterSpells = new FilterCard("Goblin spells"); static { - filterSpells.add(new SubtypePredicate(SubType.GOBLIN)); + filterSpells.add(SubType.GOBLIN.getPredicate()); } public GoblinWarchief(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinWizard.java b/Mage.Sets/src/mage/cards/g/GoblinWizard.java index feaacce19c..53752b84b1 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWizard.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWizard.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.Target; import mage.target.TargetPermanent; @@ -30,8 +29,8 @@ public final class GoblinWizard extends CardImpl { private static final FilterPermanent goblinPermanent = new FilterPermanent("Goblin"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); - goblinPermanent.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); + goblinPermanent.add(SubType.GOBLIN.getPredicate()); } public GoblinWizard(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinsOfTheFlarg.java b/Mage.Sets/src/mage/cards/g/GoblinsOfTheFlarg.java index 7aa215718f..31dc1d576c 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinsOfTheFlarg.java +++ b/Mage.Sets/src/mage/cards/g/GoblinsOfTheFlarg.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -22,7 +21,7 @@ public final class GoblinsOfTheFlarg extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a Dwarf"); static { - filter.add(new SubtypePredicate(SubType.DWARF)); + filter.add(SubType.DWARF.getPredicate()); } public GoblinsOfTheFlarg(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GodoBanditWarlord.java b/Mage.Sets/src/mage/cards/g/GodoBanditWarlord.java index 8087a50f4c..11d4c9d041 100644 --- a/Mage.Sets/src/mage/cards/g/GodoBanditWarlord.java +++ b/Mage.Sets/src/mage/cards/g/GodoBanditWarlord.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetCardInLibrary; @@ -31,7 +30,7 @@ public final class GodoBanditWarlord extends CardImpl { private static final FilterControlledCreaturePermanent filter2 = new FilterControlledCreaturePermanent(SubType.SAMURAI); static { - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); filter2.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/g/GoldmeadowStalwart.java b/Mage.Sets/src/mage/cards/g/GoldmeadowStalwart.java index d61aa243f3..ecf163aa81 100644 --- a/Mage.Sets/src/mage/cards/g/GoldmeadowStalwart.java +++ b/Mage.Sets/src/mage/cards/g/GoldmeadowStalwart.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; /** @@ -22,7 +21,7 @@ public final class GoldmeadowStalwart extends CardImpl { private static final FilterCard filter = new FilterCard("a Kithkin card from your hand"); static { - filter.add(new SubtypePredicate(SubType.KITHKIN)); + filter.add(SubType.KITHKIN.getPredicate()); } public GoldmeadowStalwart(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GrafHarvest.java b/Mage.Sets/src/mage/cards/g/GrafHarvest.java index 69e8bec3de..d2196dc895 100644 --- a/Mage.Sets/src/mage/cards/g/GrafHarvest.java +++ b/Mage.Sets/src/mage/cards/g/GrafHarvest.java @@ -19,7 +19,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.ZombieToken; import mage.target.common.TargetCardInYourGraveyard; @@ -32,7 +31,7 @@ public final class GrafHarvest extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Zombies you control"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public GrafHarvest(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GraniteGrip.java b/Mage.Sets/src/mage/cards/g/GraniteGrip.java index 0822831b71..9578425c75 100644 --- a/Mage.Sets/src/mage/cards/g/GraniteGrip.java +++ b/Mage.Sets/src/mage/cards/g/GraniteGrip.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -25,7 +24,7 @@ public final class GraniteGrip extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Mountain you control"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/g/GrasslandCrusader.java b/Mage.Sets/src/mage/cards/g/GrasslandCrusader.java index a632e65d54..36155fae80 100644 --- a/Mage.Sets/src/mage/cards/g/GrasslandCrusader.java +++ b/Mage.Sets/src/mage/cards/g/GrasslandCrusader.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -27,7 +26,7 @@ public final class GrasslandCrusader extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Elf or Soldier creature"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.ELF), new SubtypePredicate(SubType.SOLDIER))); + filter.add(Predicates.or(SubType.ELF.getPredicate(), SubType.SOLDIER.getPredicate())); } public GrasslandCrusader(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GraveBramble.java b/Mage.Sets/src/mage/cards/g/GraveBramble.java index a07743411e..3cb26cc51c 100644 --- a/Mage.Sets/src/mage/cards/g/GraveBramble.java +++ b/Mage.Sets/src/mage/cards/g/GraveBramble.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class GraveBramble extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("Zombies"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public GraveBramble(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GraveDefiler.java b/Mage.Sets/src/mage/cards/g/GraveDefiler.java index fb3d57e8a5..2b864c49a9 100644 --- a/Mage.Sets/src/mage/cards/g/GraveDefiler.java +++ b/Mage.Sets/src/mage/cards/g/GraveDefiler.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -25,7 +24,7 @@ public final class GraveDefiler extends CardImpl { private static final FilterCard filter = new FilterCard("Zombie cards"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public GraveDefiler(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GraveSifter.java b/Mage.Sets/src/mage/cards/g/GraveSifter.java index f00a35e2c3..2f19cfc1e8 100644 --- a/Mage.Sets/src/mage/cards/g/GraveSifter.java +++ b/Mage.Sets/src/mage/cards/g/GraveSifter.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.Target; @@ -80,7 +79,7 @@ class GraveSifterEffect extends OneShotEffect { if (player.choose(outcome, typeChoice, game)) { game.informPlayers(player.getLogName() + " has chosen: " + typeChoice.getChoice()); FilterCard filter = new FilterCreatureCard("creature cards with creature type " + typeChoice.getChoice() + " from your graveyard"); - filter.add(new SubtypePredicate(SubType.byDescription(typeChoice.getChoice()))); + filter.add(SubType.byDescription(typeChoice.getChoice()).getPredicate()); Target target = new TargetCardInYourGraveyard(0, Integer.MAX_VALUE, filter); player.chooseTarget(outcome, target, source, game); player.moveCards(new CardsImpl(target.getTargets()), Zone.HAND, source, game); diff --git a/Mage.Sets/src/mage/cards/g/GravebornMuse.java b/Mage.Sets/src/mage/cards/g/GravebornMuse.java index ad93910a84..202b904416 100644 --- a/Mage.Sets/src/mage/cards/g/GravebornMuse.java +++ b/Mage.Sets/src/mage/cards/g/GravebornMuse.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class GravebornMuse extends CardImpl { private static FilterControlledPermanent filter = new FilterControlledPermanent("Zombie you control"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public GravebornMuse(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/Gravecrawler.java b/Mage.Sets/src/mage/cards/g/Gravecrawler.java index 6c119740d8..9346e391fa 100644 --- a/Mage.Sets/src/mage/cards/g/Gravecrawler.java +++ b/Mage.Sets/src/mage/cards/g/Gravecrawler.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; /** @@ -51,7 +50,7 @@ class GravecrawlerPlayEffect extends AsThoughEffectImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("zombie"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public GravecrawlerPlayEffect() { diff --git a/Mage.Sets/src/mage/cards/g/GravespawnSovereign.java b/Mage.Sets/src/mage/cards/g/GravespawnSovereign.java index dad0cec4b6..aaadb15fb6 100644 --- a/Mage.Sets/src/mage/cards/g/GravespawnSovereign.java +++ b/Mage.Sets/src/mage/cards/g/GravespawnSovereign.java @@ -15,7 +15,6 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetCardInGraveyard; import mage.target.common.TargetControlledCreaturePermanent; @@ -29,7 +28,7 @@ public final class GravespawnSovereign extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Zombies you control"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java b/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java index 88be27c426..a208535e70 100644 --- a/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java +++ b/Mage.Sets/src/mage/cards/g/GreatbowDoyen.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -31,7 +30,7 @@ public final class GreatbowDoyen extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.ARCHER)); + filter.add(SubType.ARCHER.getPredicate()); } public GreatbowDoyen(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/Greedo.java b/Mage.Sets/src/mage/cards/g/Greedo.java index a885ba32bb..16bf9f64eb 100644 --- a/Mage.Sets/src/mage/cards/g/Greedo.java +++ b/Mage.Sets/src/mage/cards/g/Greedo.java @@ -14,7 +14,6 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.BlockedByIdPredicate; import mage.filter.predicate.permanent.BlockingAttackerIdPredicate; import mage.target.common.TargetCardInLibrary; @@ -28,7 +27,7 @@ public final class Greedo extends CardImpl { private static final FilterCard filterCard = new FilterCard("Hunter or Rogue card"); static { - filterCard.add(Predicates.or(new SubtypePredicate(SubType.ROGUE), new SubtypePredicate(SubType.HUNTER))); + filterCard.add(Predicates.or(SubType.ROGUE.getPredicate(), SubType.HUNTER.getPredicate())); } diff --git a/Mage.Sets/src/mage/cards/g/GreensideWatcher.java b/Mage.Sets/src/mage/cards/g/GreensideWatcher.java index 210c4ee713..936c12425c 100644 --- a/Mage.Sets/src/mage/cards/g/GreensideWatcher.java +++ b/Mage.Sets/src/mage/cards/g/GreensideWatcher.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -24,7 +23,7 @@ public final class GreensideWatcher extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Gate"); static { - filter.add(new SubtypePredicate(SubType.GATE)); + filter.add(SubType.GATE.getPredicate()); } public GreensideWatcher(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GriffinRider.java b/Mage.Sets/src/mage/cards/g/GriffinRider.java index 8f0cfe7e2e..234754c00c 100644 --- a/Mage.Sets/src/mage/cards/g/GriffinRider.java +++ b/Mage.Sets/src/mage/cards/g/GriffinRider.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -30,7 +29,7 @@ public final class GriffinRider extends CardImpl { private static final FilterPermanent filterGriffinCard = new FilterCreaturePermanent(); static { - filterGriffinCard.add(new SubtypePredicate(SubType.GRIFFIN)); + filterGriffinCard.add(SubType.GRIFFIN.getPredicate()); } public GriffinRider(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GrimCaptainsCall.java b/Mage.Sets/src/mage/cards/g/GrimCaptainsCall.java index 66ef4f32ef..c45e62972a 100644 --- a/Mage.Sets/src/mage/cards/g/GrimCaptainsCall.java +++ b/Mage.Sets/src/mage/cards/g/GrimCaptainsCall.java @@ -12,7 +12,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; @@ -71,7 +70,7 @@ class GrimCaptainsCallEffect extends OneShotEffect { private void returnToHand(Game game, SubType subType, Player controller, Ability source) { FilterCreatureCard filter = new FilterCreatureCard(subType.getDescription() + " card"); - filter.add(new SubtypePredicate(subType)); + filter.add(subType.getPredicate()); TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(new FilterCreatureCard(filter)); if (target.canChoose(source.getSourceId(), source.getControllerId(), game)) { if (controller.chooseTarget(outcome, target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java b/Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java index 3fd572c471..4534a624dc 100644 --- a/Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java +++ b/Mage.Sets/src/mage/cards/g/GrimlockDinobotLeader.java @@ -19,7 +19,6 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TransformedPredicate; @@ -31,13 +30,13 @@ public final class GrimlockDinobotLeader extends CardImpl{ private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Dinosaurs and Vehicles"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.DINOSAUR), new SubtypePredicate(SubType.VEHICLE))); + filter.add(Predicates.or(SubType.DINOSAUR.getPredicate(), SubType.VEHICLE.getPredicate())); } private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("Transformers creatures"); static { - filter2.add(Predicates.not(new SubtypePredicate(SubType.DINOSAUR))); - filter2.add(Predicates.not(new SubtypePredicate(SubType.VEHICLE))); + filter2.add(Predicates.not(SubType.DINOSAUR.getPredicate())); + filter2.add(Predicates.not(SubType.VEHICLE.getPredicate())); filter2.add(Predicates.or(new AbilityPredicate(TransformAbility.class), TransformedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/g/GripOfPhyresis.java b/Mage.Sets/src/mage/cards/g/GripOfPhyresis.java index 1010d34a5b..89bf5fe512 100644 --- a/Mage.Sets/src/mage/cards/g/GripOfPhyresis.java +++ b/Mage.Sets/src/mage/cards/g/GripOfPhyresis.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.GermToken; @@ -29,7 +28,7 @@ public final class GripOfPhyresis extends CardImpl { static { filter.add(CardType.ARTIFACT.getPredicate()); - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); } public GripOfPhyresis(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GrixisPanorama.java b/Mage.Sets/src/mage/cards/g/GrixisPanorama.java index 6e94bdea17..c7b50df8d9 100644 --- a/Mage.Sets/src/mage/cards/g/GrixisPanorama.java +++ b/Mage.Sets/src/mage/cards/g/GrixisPanorama.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; @@ -30,9 +29,9 @@ public final class GrixisPanorama extends CardImpl { filter.add(CardType.LAND.getPredicate()); filter.add(new SupertypePredicate(SuperType.BASIC)); filter.add(Predicates.or( - new SubtypePredicate(SubType.ISLAND), - new SubtypePredicate(SubType.SWAMP), - new SubtypePredicate(SubType.MOUNTAIN))); + SubType.ISLAND.getPredicate(), + SubType.SWAMP.getPredicate(), + SubType.MOUNTAIN.getPredicate())); } public GrixisPanorama(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GuardianBeast.java b/Mage.Sets/src/mage/cards/g/GuardianBeast.java index 4011ce5f26..3bca6e2f4a 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianBeast.java +++ b/Mage.Sets/src/mage/cards/g/GuardianBeast.java @@ -20,7 +20,6 @@ import mage.filter.FilterStackObject; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledArtifactPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -38,7 +37,7 @@ public final class GuardianBeast extends CardImpl { static { filterAura.add(CardType.ENCHANTMENT.getPredicate()); - filterAura.add(new SubtypePredicate(SubType.AURA)); + filterAura.add(SubType.AURA.getPredicate()); filter.add(Predicates.not(CardType.CREATURE.getPredicate())); } diff --git a/Mage.Sets/src/mage/cards/g/GuardianOfCloverdell.java b/Mage.Sets/src/mage/cards/g/GuardianOfCloverdell.java index c7d24ef57f..0489608c26 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianOfCloverdell.java +++ b/Mage.Sets/src/mage/cards/g/GuardianOfCloverdell.java @@ -17,7 +17,6 @@ import mage.constants.ColoredManaSymbol; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.KithkinToken; import mage.target.common.TargetControlledPermanent; @@ -30,7 +29,7 @@ public final class GuardianOfCloverdell extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Kithkin"); static { - filter.add(new SubtypePredicate(SubType.KITHKIN)); + filter.add(SubType.KITHKIN.getPredicate()); } public GuardianOfCloverdell(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GuardianOfTheGreatConduit.java b/Mage.Sets/src/mage/cards/g/GuardianOfTheGreatConduit.java index 8cb789c084..7248628908 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianOfTheGreatConduit.java +++ b/Mage.Sets/src/mage/cards/g/GuardianOfTheGreatConduit.java @@ -19,8 +19,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; - /** * * @author LevelX2 @@ -32,7 +30,7 @@ public final class GuardianOfTheGreatConduit extends CardImpl { static { filter.add(CardType.PLANESWALKER.getPredicate()); - filter.add(new SubtypePredicate(SubType.NISSA)); + filter.add(SubType.NISSA.getPredicate()); } public GuardianOfTheGreatConduit(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GuildSummit.java b/Mage.Sets/src/mage/cards/g/GuildSummit.java index 5f66810b15..0a73922e9f 100644 --- a/Mage.Sets/src/mage/cards/g/GuildSummit.java +++ b/Mage.Sets/src/mage/cards/g/GuildSummit.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; @@ -30,7 +29,7 @@ public final class GuildSummit extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("a Gate"); static { - filter.add(new SubtypePredicate(SubType.GATE)); + filter.add(SubType.GATE.getPredicate()); } public GuildSummit(UUID ownerId, CardSetInfo setInfo) { @@ -65,7 +64,7 @@ class GuildSummitEffect extends OneShotEffect { static { filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new SubtypePredicate(SubType.GATE)); + filter.add(SubType.GATE.getPredicate()); } public GuildSummitEffect() { diff --git a/Mage.Sets/src/mage/cards/g/Gush.java b/Mage.Sets/src/mage/cards/g/Gush.java index 67e5cb9c1b..834b07d3b2 100644 --- a/Mage.Sets/src/mage/cards/g/Gush.java +++ b/Mage.Sets/src/mage/cards/g/Gush.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -21,7 +20,7 @@ public final class Gush extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("Islands"); static{ - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } public Gush(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{4}{U}"); diff --git a/Mage.Sets/src/mage/cards/g/GutwrencherOni.java b/Mage.Sets/src/mage/cards/g/GutwrencherOni.java index 7b7ac2638a..e3ad6147ba 100644 --- a/Mage.Sets/src/mage/cards/g/GutwrencherOni.java +++ b/Mage.Sets/src/mage/cards/g/GutwrencherOni.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -27,7 +26,7 @@ public final class GutwrencherOni extends CardImpl { private static final FilterPermanent filter = new FilterControlledCreaturePermanent("Ogre"); static { - filter.add(new SubtypePredicate(SubType.OGRE)); + filter.add(SubType.OGRE.getPredicate()); } public GutwrencherOni(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GwyllionHedgeMage.java b/Mage.Sets/src/mage/cards/g/GwyllionHedgeMage.java index 7a1c568f8e..5965039d08 100644 --- a/Mage.Sets/src/mage/cards/g/GwyllionHedgeMage.java +++ b/Mage.Sets/src/mage/cards/g/GwyllionHedgeMage.java @@ -16,7 +16,6 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.KithkinToken; import mage.target.common.TargetCreaturePermanent; @@ -31,8 +30,8 @@ public final class GwyllionHedgeMage extends CardImpl { private static final FilterLandPermanent filter2 = new FilterLandPermanent("Swamps"); static { - filter.add(new SubtypePredicate(SubType.PLAINS)); - filter2.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.PLAINS.getPredicate()); + filter2.add(SubType.SWAMP.getPredicate()); } private static final String rule1 = "When {this} enters the battlefield, if you control two or more Plains, you may create a 1/1 white Kithkin Soldier creature token."; diff --git a/Mage.Sets/src/mage/cards/h/HaazdaExonerator.java b/Mage.Sets/src/mage/cards/h/HaazdaExonerator.java index 541f364a8c..b7c3c2868f 100644 --- a/Mage.Sets/src/mage/cards/h/HaazdaExonerator.java +++ b/Mage.Sets/src/mage/cards/h/HaazdaExonerator.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -26,7 +25,7 @@ public final class HaazdaExonerator extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Aura"); static { - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); } public HaazdaExonerator(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HagHedgeMage.java b/Mage.Sets/src/mage/cards/h/HagHedgeMage.java index b7cd8bee85..8f4d90b820 100644 --- a/Mage.Sets/src/mage/cards/h/HagHedgeMage.java +++ b/Mage.Sets/src/mage/cards/h/HagHedgeMage.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPlayer; import mage.target.common.TargetCardInYourGraveyard; @@ -30,8 +29,8 @@ public final class HagHedgeMage extends CardImpl { private static final FilterLandPermanent filter2 = new FilterLandPermanent(); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); - filter2.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.SWAMP.getPredicate()); + filter2.add(SubType.FOREST.getPredicate()); } private String rule = "When {this} enters the battlefield, if you control two or more Swamps, you may have target player discard a card."; diff --git a/Mage.Sets/src/mage/cards/h/HagraDiabolist.java b/Mage.Sets/src/mage/cards/h/HagraDiabolist.java index 50bb89ce46..639d4ba416 100644 --- a/Mage.Sets/src/mage/cards/h/HagraDiabolist.java +++ b/Mage.Sets/src/mage/cards/h/HagraDiabolist.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPlayer; @@ -26,7 +25,7 @@ public final class HagraDiabolist extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Allies you control"); static { - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/h/HakimLoreweaver.java b/Mage.Sets/src/mage/cards/h/HakimLoreweaver.java index e428635974..b20a1989f3 100644 --- a/Mage.Sets/src/mage/cards/h/HakimLoreweaver.java +++ b/Mage.Sets/src/mage/cards/h/HakimLoreweaver.java @@ -18,7 +18,6 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardIdPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.other.AuraCardCanAttachToPermanentId; import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.AttachedToPredicate; @@ -40,7 +39,7 @@ public final class HakimLoreweaver extends CardImpl { static { filter.add(CardType.ENCHANTMENT.getPredicate()); - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); filter.add(new OwnerPredicate(TargetController.YOU)); } @@ -68,7 +67,7 @@ public final class HakimLoreweaver extends CardImpl { // {U}{U}, {tap}: Destroy all Auras attached to Hakim. FilterPermanent filterAurasOnHakim = new FilterPermanent("Auras attached to Hakim"); filterAurasOnHakim.add(CardType.ENCHANTMENT.getPredicate()); - filterAurasOnHakim.add(new SubtypePredicate(SubType.AURA)); + filterAurasOnHakim.add(SubType.AURA.getPredicate()); FilterPermanent filterSourceId = new FilterPermanent(); filterSourceId.add(new CardIdPredicate(this.getId())); filterAurasOnHakim.add(new AttachedToPredicate(filterSourceId)); diff --git a/Mage.Sets/src/mage/cards/h/HalimarExcavator.java b/Mage.Sets/src/mage/cards/h/HalimarExcavator.java index cd5f3ec0a7..7b7124ef00 100644 --- a/Mage.Sets/src/mage/cards/h/HalimarExcavator.java +++ b/Mage.Sets/src/mage/cards/h/HalimarExcavator.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPlayer; @@ -26,7 +25,7 @@ public final class HalimarExcavator extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Allies you control"); static { - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/h/HaloHunter.java b/Mage.Sets/src/mage/cards/h/HaloHunter.java index 527369f417..e682f73f57 100644 --- a/Mage.Sets/src/mage/cards/h/HaloHunter.java +++ b/Mage.Sets/src/mage/cards/h/HaloHunter.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class HaloHunter extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Angel"); static { - filter.add(new SubtypePredicate(SubType.ANGEL)); + filter.add(SubType.ANGEL.getPredicate()); } public HaloHunter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HamletCaptain.java b/Mage.Sets/src/mage/cards/h/HamletCaptain.java index dc8c90976c..1bb70b08f4 100644 --- a/Mage.Sets/src/mage/cards/h/HamletCaptain.java +++ b/Mage.Sets/src/mage/cards/h/HamletCaptain.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class HamletCaptain extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Humans"); static { - filter.add(new SubtypePredicate(SubType.HUMAN)); + filter.add(SubType.HUMAN.getPredicate()); } public HamletCaptain(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HammerOfRuin.java b/Mage.Sets/src/mage/cards/h/HammerOfRuin.java index 9997a78b0a..e87d8f6645 100644 --- a/Mage.Sets/src/mage/cards/h/HammerOfRuin.java +++ b/Mage.Sets/src/mage/cards/h/HammerOfRuin.java @@ -16,7 +16,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; @@ -80,7 +79,7 @@ class HammerOfRuinTriggeredAbility extends TriggeredAbilityImpl { Permanent p = game.getPermanent(event.getSourceId()); if (damageEvent.isCombatDamage() && p != null && p.getAttachments().contains(this.getSourceId())) { FilterPermanent filter = new FilterPermanent("Equipment that player controls"); - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); filter.add(new ControllerIdPredicate(event.getPlayerId())); filter.setMessage("creature controlled by " + game.getPlayer(event.getTargetId()).getLogName()); diff --git a/Mage.Sets/src/mage/cards/h/HammerheadCorvette.java b/Mage.Sets/src/mage/cards/h/HammerheadCorvette.java index c24bc7ef69..666bdce1d2 100644 --- a/Mage.Sets/src/mage/cards/h/HammerheadCorvette.java +++ b/Mage.Sets/src/mage/cards/h/HammerheadCorvette.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.DefendingPlayerControlsPredicate; import mage.target.common.TargetCreaturePermanent; @@ -27,7 +26,7 @@ public final class HammerheadCorvette extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Starship creature defending player controls"); static { - filter.add(new SubtypePredicate(SubType.STARSHIP)); + filter.add(SubType.STARSHIP.getPredicate()); filter.add(DefendingPlayerControlsPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/h/HanSolo.java b/Mage.Sets/src/mage/cards/h/HanSolo.java index c11bd34080..7c0017e701 100644 --- a/Mage.Sets/src/mage/cards/h/HanSolo.java +++ b/Mage.Sets/src/mage/cards/h/HanSolo.java @@ -13,7 +13,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -26,7 +25,7 @@ public final class HanSolo extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Starship you control"); static { - filter.add(new SubtypePredicate(SubType.STARSHIP)); + filter.add(SubType.STARSHIP.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/h/HanaKami.java b/Mage.Sets/src/mage/cards/h/HanaKami.java index 93bd015efa..177438ec96 100644 --- a/Mage.Sets/src/mage/cards/h/HanaKami.java +++ b/Mage.Sets/src/mage/cards/h/HanaKami.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInYourGraveyard; /** @@ -26,7 +25,7 @@ public final class HanaKami extends CardImpl { private static final FilterCard filter = new FilterCard("Arcane card from your graveyard"); static { - filter.add(new SubtypePredicate(SubType.ARCANE)); + filter.add(SubType.ARCANE.getPredicate()); } public HanaKami(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HarabazDruid.java b/Mage.Sets/src/mage/cards/h/HarabazDruid.java index 815421a106..f518ca1721 100644 --- a/Mage.Sets/src/mage/cards/h/HarabazDruid.java +++ b/Mage.Sets/src/mage/cards/h/HarabazDruid.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @author Loki @@ -22,7 +21,7 @@ public final class HarabazDruid extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Allies you control"); static { - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); } public HarabazDruid(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HarbingerOfSpring.java b/Mage.Sets/src/mage/cards/h/HarbingerOfSpring.java index 859d4a6f55..c441dd81bf 100644 --- a/Mage.Sets/src/mage/cards/h/HarbingerOfSpring.java +++ b/Mage.Sets/src/mage/cards/h/HarbingerOfSpring.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -21,7 +20,7 @@ public final class HarbingerOfSpring extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Spirit creatures"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.SPIRIT))); + filter.add(Predicates.not(SubType.SPIRIT.getPredicate())); } public HarbingerOfSpring(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HarborBandit.java b/Mage.Sets/src/mage/cards/h/HarborBandit.java index b9c4d06bdf..8c6a05681f 100644 --- a/Mage.Sets/src/mage/cards/h/HarborBandit.java +++ b/Mage.Sets/src/mage/cards/h/HarborBandit.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -29,7 +28,7 @@ public final class HarborBandit extends CardImpl { private static final String rule = "{this} gets +1/+1 as long as you control an Island"; static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } public HarborBandit(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HarmonicSliver.java b/Mage.Sets/src/mage/cards/h/HarmonicSliver.java index 9ab665acf5..6abf050320 100644 --- a/Mage.Sets/src/mage/cards/h/HarmonicSliver.java +++ b/Mage.Sets/src/mage/cards/h/HarmonicSliver.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import java.util.UUID; @@ -28,7 +27,7 @@ public final class HarmonicSliver extends CardImpl { private static final FilterCreaturePermanent filterSliver = new FilterCreaturePermanent(); static { - filterSliver.add(new SubtypePredicate(SubType.SLIVER)); + filterSliver.add(SubType.SLIVER.getPredicate()); } public HarmonicSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HarmoniousArchon.java b/Mage.Sets/src/mage/cards/h/HarmoniousArchon.java index 71150b769b..94e7c6baf1 100644 --- a/Mage.Sets/src/mage/cards/h/HarmoniousArchon.java +++ b/Mage.Sets/src/mage/cards/h/HarmoniousArchon.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.HumanToken; import java.util.UUID; @@ -26,7 +25,7 @@ public final class HarmoniousArchon extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Archon creatures"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.ARCHON))); + filter.add(Predicates.not(SubType.ARCHON.getPredicate())); } public HarmoniousArchon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HarpoonSniper.java b/Mage.Sets/src/mage/cards/h/HarpoonSniper.java index 0162219086..74b5f156cb 100644 --- a/Mage.Sets/src/mage/cards/h/HarpoonSniper.java +++ b/Mage.Sets/src/mage/cards/h/HarpoonSniper.java @@ -16,7 +16,6 @@ import mage.constants.ColoredManaSymbol; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetAttackingOrBlockingCreature; /** @@ -28,7 +27,7 @@ public final class HarpoonSniper extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Merfolk you control"); static { - filter.add(new SubtypePredicate(SubType.MERFOLK)); + filter.add(SubType.MERFOLK.getPredicate()); } public HarpoonSniper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HarshMercy.java b/Mage.Sets/src/mage/cards/h/HarshMercy.java index 748c75d06c..5b86162a80 100644 --- a/Mage.Sets/src/mage/cards/h/HarshMercy.java +++ b/Mage.Sets/src/mage/cards/h/HarshMercy.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; @@ -83,7 +82,7 @@ class HarshMercyEffect extends OneShotEffect { FilterPermanent filter = new FilterCreaturePermanent("creatures"); for (String type : chosenTypes) { - filter.add(Predicates.not(new SubtypePredicate(SubType.byDescription(type)))); + filter.add(Predicates.not(SubType.byDescription(type).getPredicate())); } return new DestroyAllEffect(filter, true).apply(game, source); diff --git a/Mage.Sets/src/mage/cards/h/HashepOasis.java b/Mage.Sets/src/mage/cards/h/HashepOasis.java index da82f5b310..e7cf1c0241 100644 --- a/Mage.Sets/src/mage/cards/h/HashepOasis.java +++ b/Mage.Sets/src/mage/cards/h/HashepOasis.java @@ -18,7 +18,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -31,7 +30,7 @@ public final class HashepOasis extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Desert"); static { - filter.add(new SubtypePredicate(SubType.DESERT)); + filter.add(SubType.DESERT.getPredicate()); } public HashepOasis(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); diff --git a/Mage.Sets/src/mage/cards/h/HavengulRunebinder.java b/Mage.Sets/src/mage/cards/h/HavengulRunebinder.java index 37036c601e..44ae097910 100644 --- a/Mage.Sets/src/mage/cards/h/HavengulRunebinder.java +++ b/Mage.Sets/src/mage/cards/h/HavengulRunebinder.java @@ -17,7 +17,6 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.ZombieToken; import mage.target.common.TargetCardInYourGraveyard; @@ -31,7 +30,7 @@ public final class HavengulRunebinder extends CardImpl { private static final FilterControlledCreaturePermanent filterPermanent = new FilterControlledCreaturePermanent("Zombie creature you control"); static { - filterPermanent.add(new SubtypePredicate(SubType.ZOMBIE)); + filterPermanent.add(SubType.ZOMBIE.getPredicate()); } public HavengulRunebinder(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HazardTrooper.java b/Mage.Sets/src/mage/cards/h/HazardTrooper.java index 7f2e1d83a0..0e95bdaa06 100644 --- a/Mage.Sets/src/mage/cards/h/HazardTrooper.java +++ b/Mage.Sets/src/mage/cards/h/HazardTrooper.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class HazardTrooper extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Trooper creatures"); static { - filter.add(new SubtypePredicate(SubType.TROOPER)); + filter.add(SubType.TROOPER.getPredicate()); } public HazardTrooper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HazezonTamar.java b/Mage.Sets/src/mage/cards/h/HazezonTamar.java index 3207eaa900..63391de1a4 100644 --- a/Mage.Sets/src/mage/cards/h/HazezonTamar.java +++ b/Mage.Sets/src/mage/cards/h/HazezonTamar.java @@ -21,7 +21,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.token.HazezonTamarSandWarriorToken; import mage.players.Player; @@ -35,8 +34,8 @@ public final class HazezonTamar extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Sand Warriors"); static { - filter.add(new SubtypePredicate(SubType.SAND)); - filter.add(new SubtypePredicate(SubType.WARRIOR)); + filter.add(SubType.SAND.getPredicate()); + filter.add(SubType.WARRIOR.getPredicate()); } public HazezonTamar(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HeWhoHungers.java b/Mage.Sets/src/mage/cards/h/HeWhoHungers.java index 2268d1421e..fff2790e39 100644 --- a/Mage.Sets/src/mage/cards/h/HeWhoHungers.java +++ b/Mage.Sets/src/mage/cards/h/HeWhoHungers.java @@ -23,7 +23,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetOpponent; @@ -35,7 +34,7 @@ public final class HeWhoHungers extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Spirit"); static { - filter.add(new SubtypePredicate(SubType.SPIRIT)); + filter.add(SubType.SPIRIT.getPredicate()); } public HeWhoHungers(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HeadstrongBrute.java b/Mage.Sets/src/mage/cards/h/HeadstrongBrute.java index d04c6920f6..99cace29f2 100644 --- a/Mage.Sets/src/mage/cards/h/HeadstrongBrute.java +++ b/Mage.Sets/src/mage/cards/h/HeadstrongBrute.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -28,7 +27,7 @@ public final class HeadstrongBrute extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("another Pirate"); static { - filter.add(new SubtypePredicate(SubType.PIRATE)); + filter.add(SubType.PIRATE.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/h/HeartOfYavimaya.java b/Mage.Sets/src/mage/cards/h/HeartOfYavimaya.java index 500ba3f144..63d4b00e69 100644 --- a/Mage.Sets/src/mage/cards/h/HeartOfYavimaya.java +++ b/Mage.Sets/src/mage/cards/h/HeartOfYavimaya.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -30,7 +29,7 @@ public final class HeartOfYavimaya extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Forest"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public HeartOfYavimaya(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HeartSliver.java b/Mage.Sets/src/mage/cards/h/HeartSliver.java index 0fcae4f4ee..2333dcc1f0 100644 --- a/Mage.Sets/src/mage/cards/h/HeartSliver.java +++ b/Mage.Sets/src/mage/cards/h/HeartSliver.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @author Loki @@ -23,7 +22,7 @@ public final class HeartSliver extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("All sliver creatures"); static { - filter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); } public HeartSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HeartWolf.java b/Mage.Sets/src/mage/cards/h/HeartWolf.java index 3c88995a5b..b4e3dd0664 100644 --- a/Mage.Sets/src/mage/cards/h/HeartWolf.java +++ b/Mage.Sets/src/mage/cards/h/HeartWolf.java @@ -4,12 +4,10 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; -import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.IsPhaseCondition; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.decorator.ConditionalActivatedAbility; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; -import mage.abilities.effects.common.ExileGraveyardAllTargetPlayerEffect; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; @@ -18,13 +16,9 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.ZoneChangeEvent; -import mage.game.turn.Phase; -import mage.target.Target; -import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; /** @@ -36,7 +30,7 @@ public final class HeartWolf extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new SubtypePredicate(SubType.DWARF)); + filter.add(SubType.DWARF.getPredicate()); } public HeartWolf(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HearthcageGiant.java b/Mage.Sets/src/mage/cards/h/HearthcageGiant.java index c7860737ef..5d141cdd3f 100644 --- a/Mage.Sets/src/mage/cards/h/HearthcageGiant.java +++ b/Mage.Sets/src/mage/cards/h/HearthcageGiant.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.ElementalShamanToken; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -32,8 +31,8 @@ public final class HearthcageGiant extends CardImpl { private static final FilterCreaturePermanent filterGiant = new FilterCreaturePermanent("Giant"); static { - filterElemental.add(new SubtypePredicate(SubType.ELEMENTAL)); - filterGiant.add(new SubtypePredicate(SubType.GIANT)); + filterElemental.add(SubType.ELEMENTAL.getPredicate()); + filterGiant.add(SubType.GIANT.getPredicate()); } public HearthcageGiant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HeartwoodGiant.java b/Mage.Sets/src/mage/cards/h/HeartwoodGiant.java index d6f68c91b2..7184bb9ff9 100644 --- a/Mage.Sets/src/mage/cards/h/HeartwoodGiant.java +++ b/Mage.Sets/src/mage/cards/h/HeartwoodGiant.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetPlayerOrPlaneswalker; @@ -27,7 +26,7 @@ public final class HeartwoodGiant extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Forest"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public HeartwoodGiant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HeavenlyBlademaster.java b/Mage.Sets/src/mage/cards/h/HeavenlyBlademaster.java index 20303b9d38..f640779687 100644 --- a/Mage.Sets/src/mage/cards/h/HeavenlyBlademaster.java +++ b/Mage.Sets/src/mage/cards/h/HeavenlyBlademaster.java @@ -24,7 +24,6 @@ import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -86,8 +85,8 @@ class HeavenlyBlademasterEffect extends OneShotEffect { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.AURA), - new SubtypePredicate(SubType.EQUIPMENT) + SubType.AURA.getPredicate(), + SubType.EQUIPMENT.getPredicate() )); } diff --git a/Mage.Sets/src/mage/cards/h/HeavyTrooper.java b/Mage.Sets/src/mage/cards/h/HeavyTrooper.java index cd7b76667a..80874c4500 100644 --- a/Mage.Sets/src/mage/cards/h/HeavyTrooper.java +++ b/Mage.Sets/src/mage/cards/h/HeavyTrooper.java @@ -12,7 +12,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -23,7 +22,7 @@ public final class HeavyTrooper extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Trooper creatures"); static { - filter.add(new SubtypePredicate(SubType.TROOPER)); + filter.add(SubType.TROOPER.getPredicate()); } public HeavyTrooper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/Hecatomb.java b/Mage.Sets/src/mage/cards/h/Hecatomb.java index ed9b77932c..b813d20757 100644 --- a/Mage.Sets/src/mage/cards/h/Hecatomb.java +++ b/Mage.Sets/src/mage/cards/h/Hecatomb.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetControlledPermanent; @@ -31,7 +30,7 @@ public final class Hecatomb extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("an untapped Swamp you control"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/h/HedgeTroll.java b/Mage.Sets/src/mage/cards/h/HedgeTroll.java index f8e25e5ac3..ce1438eeec 100644 --- a/Mage.Sets/src/mage/cards/h/HedgeTroll.java +++ b/Mage.Sets/src/mage/cards/h/HedgeTroll.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -25,7 +24,7 @@ public final class HedgeTroll extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Plains"); static { - filter.add(new SubtypePredicate(SubType.PLAINS)); + filter.add(SubType.PLAINS.getPredicate()); } public HedgeTroll(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HeedlessOne.java b/Mage.Sets/src/mage/cards/h/HeedlessOne.java index 2340ce8cd3..fcf825f464 100644 --- a/Mage.Sets/src/mage/cards/h/HeedlessOne.java +++ b/Mage.Sets/src/mage/cards/h/HeedlessOne.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -25,7 +24,7 @@ public final class HeedlessOne extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Elves on the battlefield"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public HeedlessOne(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HeliodsPilgrim.java b/Mage.Sets/src/mage/cards/h/HeliodsPilgrim.java index 62b826c961..6bc8beb097 100644 --- a/Mage.Sets/src/mage/cards/h/HeliodsPilgrim.java +++ b/Mage.Sets/src/mage/cards/h/HeliodsPilgrim.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -23,7 +22,7 @@ public final class HeliodsPilgrim extends CardImpl { static { filter.add(CardType.ENCHANTMENT.getPredicate()); - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); } public HeliodsPilgrim(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HeraldOfDromoka.java b/Mage.Sets/src/mage/cards/h/HeraldOfDromoka.java index 27602965f4..c7b6fe1e94 100644 --- a/Mage.Sets/src/mage/cards/h/HeraldOfDromoka.java +++ b/Mage.Sets/src/mage/cards/h/HeraldOfDromoka.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -26,7 +25,7 @@ public final class HeraldOfDromoka extends CardImpl { static { filter.add(CardType.CREATURE.getPredicate()); - filter.add(new SubtypePredicate(SubType.WARRIOR)); + filter.add(SubType.WARRIOR.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/h/HeraldsHorn.java b/Mage.Sets/src/mage/cards/h/HeraldsHorn.java index 2224de65e8..7f83bf1b34 100644 --- a/Mage.Sets/src/mage/cards/h/HeraldsHorn.java +++ b/Mage.Sets/src/mage/cards/h/HeraldsHorn.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; @@ -81,7 +80,7 @@ class HeraldsHornEffect extends OneShotEffect { // If it's a creature card of the chosen type, you may reveal it and put it into your hand. FilterCreatureCard filter = new FilterCreatureCard("creature card of the chosen type"); SubType subtype = ChooseCreatureTypeEffect.getChosenCreatureType(source.getSourceId(), game); - filter.add(new SubtypePredicate(subtype)); + filter.add(subtype.getPredicate()); String message = "Reveal the top card of your library and put that card into your hand?"; if (card != null) { if (filter.match(card, game) diff --git a/Mage.Sets/src/mage/cards/h/HerdchaserDragon.java b/Mage.Sets/src/mage/cards/h/HerdchaserDragon.java index b8970974f3..712b40d06d 100644 --- a/Mage.Sets/src/mage/cards/h/HerdchaserDragon.java +++ b/Mage.Sets/src/mage/cards/h/HerdchaserDragon.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -28,7 +27,7 @@ public final class HerdchaserDragon extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } public HerdchaserDragon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HeritageDruid.java b/Mage.Sets/src/mage/cards/h/HeritageDruid.java index 01419463c6..804c139373 100644 --- a/Mage.Sets/src/mage/cards/h/HeritageDruid.java +++ b/Mage.Sets/src/mage/cards/h/HeritageDruid.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -26,7 +25,7 @@ public final class HeritageDruid extends CardImpl { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public HeritageDruid(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HeroOfIroas.java b/Mage.Sets/src/mage/cards/h/HeroOfIroas.java index 7b6cf2d261..21855980f9 100644 --- a/Mage.Sets/src/mage/cards/h/HeroOfIroas.java +++ b/Mage.Sets/src/mage/cards/h/HeroOfIroas.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class HeroOfIroas extends CardImpl { private static final FilterCard filter = new FilterCard("Aura spells"); static { - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); } public HeroOfIroas(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HeronsGraceChampion.java b/Mage.Sets/src/mage/cards/h/HeronsGraceChampion.java index e2ae86d527..51abc54a61 100644 --- a/Mage.Sets/src/mage/cards/h/HeronsGraceChampion.java +++ b/Mage.Sets/src/mage/cards/h/HeronsGraceChampion.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -27,7 +26,7 @@ public final class HeronsGraceChampion extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("other Humans"); static { - filter.add(new SubtypePredicate(SubType.HUMAN)); + filter.add(SubType.HUMAN.getPredicate()); } public HeronsGraceChampion(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HighTide.java b/Mage.Sets/src/mage/cards/h/HighTide.java index 83b5f358ff..110db4d260 100644 --- a/Mage.Sets/src/mage/cards/h/HighTide.java +++ b/Mage.Sets/src/mage/cards/h/HighTide.java @@ -14,7 +14,6 @@ import mage.constants.ColoredManaSymbol; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -50,7 +49,7 @@ class HighTideTriggeredAbility extends DelayedTriggeredManaAbility { private static final FilterLandPermanent filter = new FilterLandPermanent("Island"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } public HighTideTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/h/HighlandBerserker.java b/Mage.Sets/src/mage/cards/h/HighlandBerserker.java index b252438271..bf1edeca06 100644 --- a/Mage.Sets/src/mage/cards/h/HighlandBerserker.java +++ b/Mage.Sets/src/mage/cards/h/HighlandBerserker.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -26,7 +25,7 @@ public final class HighlandBerserker extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Ally creatures you control"); static { - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/h/HigureTheStillWind.java b/Mage.Sets/src/mage/cards/h/HigureTheStillWind.java index f9afd32f22..b01802cf34 100644 --- a/Mage.Sets/src/mage/cards/h/HigureTheStillWind.java +++ b/Mage.Sets/src/mage/cards/h/HigureTheStillWind.java @@ -19,7 +19,6 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetCreaturePermanent; @@ -33,8 +32,8 @@ public final class HigureTheStillWind extends CardImpl { private static final FilterCreaturePermanent filterCreature = new FilterCreaturePermanent("Ninja creature"); static { - filter.add(new SubtypePredicate(SubType.NINJA)); - filterCreature.add((new SubtypePredicate(SubType.NINJA))); + filter.add(SubType.NINJA.getPredicate()); + filterCreature.add((SubType.NINJA.getPredicate())); } public HigureTheStillWind(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HinterlandHarbor.java b/Mage.Sets/src/mage/cards/h/HinterlandHarbor.java index e3256fe3f7..27b7901091 100644 --- a/Mage.Sets/src/mage/cards/h/HinterlandHarbor.java +++ b/Mage.Sets/src/mage/cards/h/HinterlandHarbor.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -27,7 +26,7 @@ public final class HinterlandHarbor extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.FOREST), new SubtypePredicate(SubType.ISLAND))); + filter.add(Predicates.or(SubType.FOREST.getPredicate(), SubType.ISLAND.getPredicate())); } public HinterlandHarbor(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HisokasDefiance.java b/Mage.Sets/src/mage/cards/h/HisokasDefiance.java index 1fd03404e2..faa1a062df 100644 --- a/Mage.Sets/src/mage/cards/h/HisokasDefiance.java +++ b/Mage.Sets/src/mage/cards/h/HisokasDefiance.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetSpell; /** @@ -21,7 +20,7 @@ public final class HisokasDefiance extends CardImpl { private static final FilterSpell filter = new FilterSpell("Spirit or Arcane spell"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.SPIRIT), new SubtypePredicate(SubType.ARCANE))); + filter.add(Predicates.or(SubType.SPIRIT.getPredicate(), SubType.ARCANE.getPredicate())); } public HisokasDefiance(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HivisOfTheScale.java b/Mage.Sets/src/mage/cards/h/HivisOfTheScale.java index 70b093b32b..8d2d7034a0 100644 --- a/Mage.Sets/src/mage/cards/h/HivisOfTheScale.java +++ b/Mage.Sets/src/mage/cards/h/HivisOfTheScale.java @@ -21,7 +21,6 @@ import mage.constants.SuperType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; @@ -39,7 +38,7 @@ public final class HivisOfTheScale extends CardImpl { static { filter.add(TappedPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); - filterDragon.add(new SubtypePredicate(SubType.DRAGON)); + filterDragon.add(SubType.DRAGON.getPredicate()); } public HivisOfTheScale(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HomingSliver.java b/Mage.Sets/src/mage/cards/h/HomingSliver.java index 98c169b2ae..2ae021d74a 100644 --- a/Mage.Sets/src/mage/cards/h/HomingSliver.java +++ b/Mage.Sets/src/mage/cards/h/HomingSliver.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; @@ -28,7 +27,7 @@ public final class HomingSliver extends CardImpl { private static final FilterCard filter = new FilterCard("Sliver card"); static { - filter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); } public HomingSliver(UUID ownerId, CardSetInfo setInfo) { @@ -59,7 +58,7 @@ class HomingSliverEffect extends ContinuousEffectImpl { private static final FilterCard filter = new FilterCard("Sliver card"); static { - filter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); } public HomingSliverEffect() { diff --git a/Mage.Sets/src/mage/cards/h/HondenOfCleansingFire.java b/Mage.Sets/src/mage/cards/h/HondenOfCleansingFire.java index 008c3899ef..386430ce15 100644 --- a/Mage.Sets/src/mage/cards/h/HondenOfCleansingFire.java +++ b/Mage.Sets/src/mage/cards/h/HondenOfCleansingFire.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -24,7 +23,7 @@ public final class HondenOfCleansingFire extends CardImpl { static final FilterControlledPermanent filter = new FilterControlledPermanent("Shrine"); static { - filter.add(new SubtypePredicate(SubType.SHRINE)); + filter.add(SubType.SHRINE.getPredicate()); } public HondenOfCleansingFire(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HondenOfInfiniteRage.java b/Mage.Sets/src/mage/cards/h/HondenOfInfiniteRage.java index e543cfea2c..02c8df2535 100644 --- a/Mage.Sets/src/mage/cards/h/HondenOfInfiniteRage.java +++ b/Mage.Sets/src/mage/cards/h/HondenOfInfiniteRage.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetAnyTarget; import java.util.UUID; @@ -27,7 +26,7 @@ public final class HondenOfInfiniteRage extends CardImpl { static final FilterControlledPermanent filter = new FilterControlledPermanent("Shrine"); static { - filter.add(new SubtypePredicate(SubType.SHRINE)); + filter.add(SubType.SHRINE.getPredicate()); } public HondenOfInfiniteRage (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HondenOfLifesWeb.java b/Mage.Sets/src/mage/cards/h/HondenOfLifesWeb.java index 82dd9e4721..90f1deaeb4 100644 --- a/Mage.Sets/src/mage/cards/h/HondenOfLifesWeb.java +++ b/Mage.Sets/src/mage/cards/h/HondenOfLifesWeb.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SpiritToken; import java.util.UUID; @@ -25,7 +24,7 @@ public final class HondenOfLifesWeb extends CardImpl { static final FilterControlledPermanent filter = new FilterControlledPermanent("Shrine"); static { - filter.add(new SubtypePredicate(SubType.SHRINE)); + filter.add(SubType.SHRINE.getPredicate()); } public HondenOfLifesWeb(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HondenOfNightsReach.java b/Mage.Sets/src/mage/cards/h/HondenOfNightsReach.java index 74f72e34c9..5d96df43be 100644 --- a/Mage.Sets/src/mage/cards/h/HondenOfNightsReach.java +++ b/Mage.Sets/src/mage/cards/h/HondenOfNightsReach.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetOpponent; import java.util.UUID; @@ -26,7 +25,7 @@ public final class HondenOfNightsReach extends CardImpl { static final FilterControlledPermanent filter = new FilterControlledPermanent("Shrine"); static { - filter.add(new SubtypePredicate(SubType.SHRINE)); + filter.add(SubType.SHRINE.getPredicate()); } public HondenOfNightsReach(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HondenOfSeeingWinds.java b/Mage.Sets/src/mage/cards/h/HondenOfSeeingWinds.java index d4954be5bb..dd4bf50e38 100644 --- a/Mage.Sets/src/mage/cards/h/HondenOfSeeingWinds.java +++ b/Mage.Sets/src/mage/cards/h/HondenOfSeeingWinds.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -24,7 +23,7 @@ public final class HondenOfSeeingWinds extends CardImpl { static final FilterControlledPermanent filter = new FilterControlledPermanent("Shrine"); static { - filter.add(new SubtypePredicate(SubType.SHRINE)); + filter.add(SubType.SHRINE.getPredicate()); } public HondenOfSeeingWinds(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HopeCharm.java b/Mage.Sets/src/mage/cards/h/HopeCharm.java index 7dc8185e84..fcfea590a0 100644 --- a/Mage.Sets/src/mage/cards/h/HopeCharm.java +++ b/Mage.Sets/src/mage/cards/h/HopeCharm.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; @@ -27,7 +26,7 @@ public final class HopeCharm extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Aura"); static { - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); } public HopeCharm(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HordeOfNotions.java b/Mage.Sets/src/mage/cards/h/HordeOfNotions.java index c532a8636e..3d3a1c79b4 100644 --- a/Mage.Sets/src/mage/cards/h/HordeOfNotions.java +++ b/Mage.Sets/src/mage/cards/h/HordeOfNotions.java @@ -16,7 +16,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; @@ -30,7 +29,7 @@ public final class HordeOfNotions extends CardImpl { private static final FilterCard filter = new FilterCard("Elemental card from your graveyard"); static { - filter.add(new SubtypePredicate(SubType.ELEMENTAL)); + filter.add(SubType.ELEMENTAL.getPredicate()); } public HordeOfNotions(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HornedSliver.java b/Mage.Sets/src/mage/cards/h/HornedSliver.java index c5388939fa..f083e8dcc0 100644 --- a/Mage.Sets/src/mage/cards/h/HornedSliver.java +++ b/Mage.Sets/src/mage/cards/h/HornedSliver.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @author Loki @@ -23,7 +22,7 @@ public final class HornedSliver extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("All Sliver creatures"); static { - filter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); } public HornedSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HorobisWhisper.java b/Mage.Sets/src/mage/cards/h/HorobisWhisper.java index 6b7939f877..9b7baa3e28 100644 --- a/Mage.Sets/src/mage/cards/h/HorobisWhisper.java +++ b/Mage.Sets/src/mage/cards/h/HorobisWhisper.java @@ -16,7 +16,6 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetCreaturePermanent; @@ -33,7 +32,7 @@ public final class HorobisWhisper extends CardImpl { static { filterTarget.add(Predicates.not(new ColorPredicate(ObjectColor.BLACK))); - filterCondition.add(new SubtypePredicate(SubType.SWAMP)); + filterCondition.add(SubType.SWAMP.getPredicate()); } public HorobisWhisper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HorrorOfHorrors.java b/Mage.Sets/src/mage/cards/h/HorrorOfHorrors.java index e1de779ea5..5900152862 100644 --- a/Mage.Sets/src/mage/cards/h/HorrorOfHorrors.java +++ b/Mage.Sets/src/mage/cards/h/HorrorOfHorrors.java @@ -15,7 +15,6 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -29,7 +28,7 @@ public final class HorrorOfHorrors extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("black creature"); static { - filter1.add(new SubtypePredicate(SubType.SWAMP)); + filter1.add(SubType.SWAMP.getPredicate()); filter2.add(new ColorPredicate(ObjectColor.BLACK)); } diff --git a/Mage.Sets/src/mage/cards/h/HourOfDevastation.java b/Mage.Sets/src/mage/cards/h/HourOfDevastation.java index 836e74b73a..3b11639593 100644 --- a/Mage.Sets/src/mage/cards/h/HourOfDevastation.java +++ b/Mage.Sets/src/mage/cards/h/HourOfDevastation.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -28,7 +27,7 @@ public final class HourOfDevastation extends CardImpl { CardType.CREATURE.getPredicate(), Predicates.and( CardType.PLANESWALKER.getPredicate(), - Predicates.not(new SubtypePredicate(SubType.BOLAS))))); + Predicates.not(SubType.BOLAS.getPredicate())))); } public HourOfDevastation(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HowlOfTheNightPack.java b/Mage.Sets/src/mage/cards/h/HowlOfTheNightPack.java index 38516aee5c..7c8c035066 100644 --- a/Mage.Sets/src/mage/cards/h/HowlOfTheNightPack.java +++ b/Mage.Sets/src/mage/cards/h/HowlOfTheNightPack.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.WolfToken; /** @@ -21,7 +20,7 @@ public final class HowlOfTheNightPack extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("for each Forest you control"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public HowlOfTheNightPack(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HowlpackAlpha.java b/Mage.Sets/src/mage/cards/h/HowlpackAlpha.java index 7bb5d62343..9128953ec2 100644 --- a/Mage.Sets/src/mage/cards/h/HowlpackAlpha.java +++ b/Mage.Sets/src/mage/cards/h/HowlpackAlpha.java @@ -22,7 +22,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.WolfToken; /** @@ -36,7 +35,7 @@ public final class HowlpackAlpha extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Werewolf and Wolf creatures"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.WEREWOLF), new SubtypePredicate(SubType.WOLF))); + filter.add(Predicates.or(SubType.WEREWOLF.getPredicate(), SubType.WOLF.getPredicate())); } public HowlpackAlpha(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HowlpackResurgence.java b/Mage.Sets/src/mage/cards/h/HowlpackResurgence.java index 77335c8620..60bd10f1ef 100644 --- a/Mage.Sets/src/mage/cards/h/HowlpackResurgence.java +++ b/Mage.Sets/src/mage/cards/h/HowlpackResurgence.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -28,8 +27,8 @@ public final class HowlpackResurgence extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you control that's a Wolf or a Werewolf"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.WOLF), - new SubtypePredicate(SubType.WEREWOLF))); + filter.add(Predicates.or(SubType.WOLF.getPredicate(), + SubType.WEREWOLF.getPredicate())); } public HowlpackResurgence(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HowlpackWolf.java b/Mage.Sets/src/mage/cards/h/HowlpackWolf.java index 4f9376a4ff..9bc57d8c94 100644 --- a/Mage.Sets/src/mage/cards/h/HowlpackWolf.java +++ b/Mage.Sets/src/mage/cards/h/HowlpackWolf.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -24,7 +23,7 @@ public final class HowlpackWolf extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("another Wolf or Werewolf"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.WOLF), new SubtypePredicate(SubType.WEREWOLF))); + filter.add(Predicates.or(SubType.WOLF.getPredicate(), SubType.WEREWOLF.getPredicate())); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/h/HuatliDinosaurKnight.java b/Mage.Sets/src/mage/cards/h/HuatliDinosaurKnight.java index 1dce1556a2..94995b3174 100644 --- a/Mage.Sets/src/mage/cards/h/HuatliDinosaurKnight.java +++ b/Mage.Sets/src/mage/cards/h/HuatliDinosaurKnight.java @@ -17,7 +17,6 @@ import mage.constants.SuperType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -32,10 +31,10 @@ public final class HuatliDinosaurKnight extends CardImpl { private static final FilterCreaturePermanent filter3 = new FilterCreaturePermanent("Dinosaurs you control"); static { - filter.add(new SubtypePredicate(SubType.DINOSAUR)); + filter.add(SubType.DINOSAUR.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); filter2.add(new ControllerPredicate(TargetController.NOT_YOU)); - filter3.add(new SubtypePredicate(SubType.DINOSAUR)); + filter3.add(SubType.DINOSAUR.getPredicate()); filter3.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/h/HuatlisSpurring.java b/Mage.Sets/src/mage/cards/h/HuatlisSpurring.java index 3332dcca36..3dd5c4f1f1 100644 --- a/Mage.Sets/src/mage/cards/h/HuatlisSpurring.java +++ b/Mage.Sets/src/mage/cards/h/HuatlisSpurring.java @@ -12,7 +12,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -27,7 +26,7 @@ public final class HuatlisSpurring extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(CardType.PLANESWALKER.getPredicate()); - filter.add(new SubtypePredicate(SubType.HUATLI)); + filter.add(SubType.HUATLI.getPredicate()); } public HuatlisSpurring(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/Hubris.java b/Mage.Sets/src/mage/cards/h/Hubris.java index 0ce92439eb..b029e5024b 100644 --- a/Mage.Sets/src/mage/cards/h/Hubris.java +++ b/Mage.Sets/src/mage/cards/h/Hubris.java @@ -13,7 +13,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterEnchantmentPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -49,7 +48,7 @@ class HubrisReturnEffect extends OneShotEffect { private static final FilterEnchantmentPermanent filter = new FilterEnchantmentPermanent(); static { - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); } public HubrisReturnEffect() { diff --git a/Mage.Sets/src/mage/cards/h/HumanFrailty.java b/Mage.Sets/src/mage/cards/h/HumanFrailty.java index a091164da7..0a0edae593 100644 --- a/Mage.Sets/src/mage/cards/h/HumanFrailty.java +++ b/Mage.Sets/src/mage/cards/h/HumanFrailty.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -19,7 +18,7 @@ public final class HumanFrailty extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Human creature"); static { - filter.add(new SubtypePredicate(SubType.HUMAN)); + filter.add(SubType.HUMAN.getPredicate()); } public HumanFrailty(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HungryLynx.java b/Mage.Sets/src/mage/cards/h/HungryLynx.java index 510456806f..b293237741 100644 --- a/Mage.Sets/src/mage/cards/h/HungryLynx.java +++ b/Mage.Sets/src/mage/cards/h/HungryLynx.java @@ -22,7 +22,6 @@ import mage.counters.CounterType; import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.DeathtouchRatToken; import mage.target.Target; import mage.target.common.TargetOpponent; @@ -35,17 +34,17 @@ public final class HungryLynx extends CardImpl { private static final FilterControlledCreaturePermanent filterCat = new FilterControlledCreaturePermanent("Cats"); static { - filterCat.add(new SubtypePredicate(SubType.CAT)); + filterCat.add(SubType.CAT.getPredicate()); } private static final FilterCard filterProRat = new FilterCard("Rats"); static { - filterProRat.add(new SubtypePredicate(SubType.RAT)); + filterProRat.add(SubType.RAT.getPredicate()); } private static final FilterCreaturePermanent filterRat = new FilterCreaturePermanent("a Rat"); static { - filterRat.add(new SubtypePredicate(SubType.RAT)); + filterRat.add(SubType.RAT.getPredicate()); } public HungryLynx(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HuntingCheetah.java b/Mage.Sets/src/mage/cards/h/HuntingCheetah.java index 8b1e0c7f31..baeb98517d 100644 --- a/Mage.Sets/src/mage/cards/h/HuntingCheetah.java +++ b/Mage.Sets/src/mage/cards/h/HuntingCheetah.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -22,7 +21,7 @@ public final class HuntingCheetah extends CardImpl { private static final FilterCard filter = new FilterCard("Forest card"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public HuntingCheetah(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HuntingWilds.java b/Mage.Sets/src/mage/cards/h/HuntingWilds.java index b916fbad7a..6bd4725904 100644 --- a/Mage.Sets/src/mage/cards/h/HuntingWilds.java +++ b/Mage.Sets/src/mage/cards/h/HuntingWilds.java @@ -22,10 +22,8 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterLandCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.token.TokenImpl; -import mage.game.permanent.token.Token; import mage.target.common.TargetCardInLibrary; import mage.target.targetpointer.FixedTargets; @@ -42,7 +40,7 @@ public final class HuntingWilds extends CardImpl { this.addAbility(new KickerAbility("{3}{G}")); FilterLandCard filter = new FilterLandCard("Forest card"); - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); // Search your library for up to two Forest cards and put them onto the battlefield tapped. Then shuffle your library. this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, filter), true)); diff --git a/Mage.Sets/src/mage/cards/h/HythoniaTheCruel.java b/Mage.Sets/src/mage/cards/h/HythoniaTheCruel.java index b5caa8524a..66ebf3a941 100644 --- a/Mage.Sets/src/mage/cards/h/HythoniaTheCruel.java +++ b/Mage.Sets/src/mage/cards/h/HythoniaTheCruel.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class HythoniaTheCruel extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Gorgon creatures"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.GORGON))); + filter.add(Predicates.not(SubType.GORGON.getPredicate())); } public HythoniaTheCruel(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java b/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java index eaf0a24a51..3335475a06 100644 --- a/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java +++ b/Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; @@ -35,8 +34,8 @@ public final class IbHalfheartGoblinTactician extends CardImpl { private static final FilterCreaturePermanent filterGoblin = new FilterCreaturePermanent("another Goblin you control"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); - filterGoblin.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); + filterGoblin.add(SubType.GOBLIN.getPredicate()); filterGoblin.add(AnotherPredicate.instance); filterGoblin.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/i/IcatianLieutenant.java b/Mage.Sets/src/mage/cards/i/IcatianLieutenant.java index 21c549870d..7b35e1dddf 100644 --- a/Mage.Sets/src/mage/cards/i/IcatianLieutenant.java +++ b/Mage.Sets/src/mage/cards/i/IcatianLieutenant.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -26,7 +25,7 @@ public final class IcatianLieutenant extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Soldier creature"); static { - filter.add(new SubtypePredicate(SubType.SOLDIER)); + filter.add(SubType.SOLDIER.getPredicate()); } public IcatianLieutenant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IconOfAncestry.java b/Mage.Sets/src/mage/cards/i/IconOfAncestry.java index c042a30edf..b27562de41 100644 --- a/Mage.Sets/src/mage/cards/i/IconOfAncestry.java +++ b/Mage.Sets/src/mage/cards/i/IconOfAncestry.java @@ -21,7 +21,6 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.Cards; import mage.cards.CardsImpl; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; @@ -103,7 +102,7 @@ class IconOfAncestryEffect extends OneShotEffect { FilterCreatureCard filter = new FilterCreatureCard("creature card that matches the chosen subtype"); SubType subtype = (SubType) game.getState().getValue(source.getSourceId() + "_type"); if (subtype != null) { - filter.add(new SubtypePredicate(subtype)); + filter.add(subtype.getPredicate()); } TargetCard target = new TargetCard(Zone.LIBRARY, filter); if (target.canChoose(controller.getId(), game) diff --git a/Mage.Sets/src/mage/cards/i/IfnirDeadlands.java b/Mage.Sets/src/mage/cards/i/IfnirDeadlands.java index 4479b95bb1..c2b32177eb 100644 --- a/Mage.Sets/src/mage/cards/i/IfnirDeadlands.java +++ b/Mage.Sets/src/mage/cards/i/IfnirDeadlands.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetOpponentsCreaturePermanent; @@ -31,7 +30,7 @@ public final class IfnirDeadlands extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Desert"); static { - filter.add(new SubtypePredicate(SubType.DESERT)); + filter.add(SubType.DESERT.getPredicate()); } public IfnirDeadlands(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IizukaTheRuthless.java b/Mage.Sets/src/mage/cards/i/IizukaTheRuthless.java index e7af463016..7f193a136b 100644 --- a/Mage.Sets/src/mage/cards/i/IizukaTheRuthless.java +++ b/Mage.Sets/src/mage/cards/i/IizukaTheRuthless.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -26,7 +25,7 @@ public final class IizukaTheRuthless extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Samurai"); static { - filter.add(new SubtypePredicate(SubType.SAMURAI)); + filter.add(SubType.SAMURAI.getPredicate()); } public IizukaTheRuthless(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/ImmaculateMagistrate.java b/Mage.Sets/src/mage/cards/i/ImmaculateMagistrate.java index 0ebc5c7368..90eb2330ac 100644 --- a/Mage.Sets/src/mage/cards/i/ImmaculateMagistrate.java +++ b/Mage.Sets/src/mage/cards/i/ImmaculateMagistrate.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; @@ -55,7 +54,7 @@ public final class ImmaculateMagistrate extends CardImpl { class ImmaculateMagistrateEffect extends OneShotEffect { static final FilterControlledPermanent filter = new FilterControlledPermanent("Elf"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public ImmaculateMagistrateEffect() { super(Outcome.BoostCreature); diff --git a/Mage.Sets/src/mage/cards/i/Immerwolf.java b/Mage.Sets/src/mage/cards/i/Immerwolf.java index ebc726beb0..efc6e0254c 100644 --- a/Mage.Sets/src/mage/cards/i/Immerwolf.java +++ b/Mage.Sets/src/mage/cards/i/Immerwolf.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -28,7 +27,7 @@ public final class Immerwolf extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Wolf and Werewolf creatures"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.WOLF), new SubtypePredicate(SubType.WEREWOLF))); + filter.add(Predicates.or(SubType.WOLF.getPredicate(), SubType.WEREWOLF.getPredicate())); } public Immerwolf(UUID ownerId, CardSetInfo setInfo) { @@ -63,8 +62,8 @@ class ImmerwolfEffect extends ContinuousRuleModifyingEffectImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new SubtypePredicate(SubType.WEREWOLF)); - filter.add(Predicates.not(new SubtypePredicate(SubType.HUMAN))); + filter.add(SubType.WEREWOLF.getPredicate()); + filter.add(Predicates.not(SubType.HUMAN.getPredicate())); } public ImmerwolfEffect() { diff --git a/Mage.Sets/src/mage/cards/i/ImperialGunner.java b/Mage.Sets/src/mage/cards/i/ImperialGunner.java index b39a25cc8c..4fdc7f8c07 100644 --- a/Mage.Sets/src/mage/cards/i/ImperialGunner.java +++ b/Mage.Sets/src/mage/cards/i/ImperialGunner.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePlayerOrPlaneswalker; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetAnyTarget; /** @@ -26,7 +25,7 @@ public final class ImperialGunner extends CardImpl { private static final FilterCreaturePlayerOrPlaneswalker filter = new FilterCreaturePlayerOrPlaneswalker("target player, planeswalker or Starship creature"); static { - filter.getCreatureFilter().add(new SubtypePredicate(SubType.STARSHIP)); + filter.getCreatureFilter().add(SubType.STARSHIP.getPredicate()); } public ImperialGunner(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/ImperialLancer.java b/Mage.Sets/src/mage/cards/i/ImperialLancer.java index 2d66089874..f317f616c6 100644 --- a/Mage.Sets/src/mage/cards/i/ImperialLancer.java +++ b/Mage.Sets/src/mage/cards/i/ImperialLancer.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class ImperialLancer extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Dinosaur"); static { - filter.add(new SubtypePredicate(SubType.DINOSAUR)); + filter.add(SubType.DINOSAUR.getPredicate()); } public ImperialLancer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/ImperiousPerfect.java b/Mage.Sets/src/mage/cards/i/ImperiousPerfect.java index cfe860dd0f..de8050532d 100644 --- a/Mage.Sets/src/mage/cards/i/ImperiousPerfect.java +++ b/Mage.Sets/src/mage/cards/i/ImperiousPerfect.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.ElfToken; /** @@ -26,7 +25,7 @@ public final class ImperiousPerfect extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Elf creatures"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public ImperiousPerfect(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/InOketrasName.java b/Mage.Sets/src/mage/cards/i/InOketrasName.java index ab0feb5e75..15e6a4383e 100644 --- a/Mage.Sets/src/mage/cards/i/InOketrasName.java +++ b/Mage.Sets/src/mage/cards/i/InOketrasName.java @@ -10,7 +10,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -21,7 +20,7 @@ public final class InOketrasName extends CardImpl { private static final FilterCreaturePermanent filterNotZombies = new FilterCreaturePermanent("Other creatures"); static { - filterNotZombies.add(Predicates.not(new SubtypePredicate(SubType.ZOMBIE))); + filterNotZombies.add(Predicates.not(SubType.ZOMBIE.getPredicate())); } public InOketrasName(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java b/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java index be50ef6f7a..05917740bf 100644 --- a/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java +++ b/Mage.Sets/src/mage/cards/i/InallaArchmageRitualist.java @@ -28,7 +28,6 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.filter.predicate.permanent.TokenPredicate; @@ -48,10 +47,10 @@ public final class InallaArchmageRitualist extends CardImpl { private static final FilterControlledPermanent filter2 = new FilterControlledPermanent("untapped Wizards you control"); static { - filter.add(new SubtypePredicate(SubType.WIZARD)); + filter.add(SubType.WIZARD.getPredicate()); filter.add(Predicates.not(TokenPredicate.instance)); filter.add(AnotherPredicate.instance); - filter2.add(new SubtypePredicate(SubType.WIZARD)); + filter2.add(SubType.WIZARD.getPredicate()); filter2.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/i/InameAsOne.java b/Mage.Sets/src/mage/cards/i/InameAsOne.java index 25b0162cc3..ba36e99e3c 100644 --- a/Mage.Sets/src/mage/cards/i/InameAsOne.java +++ b/Mage.Sets/src/mage/cards/i/InameAsOne.java @@ -22,7 +22,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; @@ -39,7 +38,7 @@ public final class InameAsOne extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("Spirit permanent card"); static { - filter.add(new SubtypePredicate(SubType.SPIRIT)); + filter.add(SubType.SPIRIT.getPredicate()); } public InameAsOne(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/InameDeathAspect.java b/Mage.Sets/src/mage/cards/i/InameDeathAspect.java index 7d9584467c..db55bead46 100644 --- a/Mage.Sets/src/mage/cards/i/InameDeathAspect.java +++ b/Mage.Sets/src/mage/cards/i/InameDeathAspect.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.cards.CardsImpl; import mage.constants.*; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; @@ -47,7 +46,7 @@ class InameDeathAspectEffect extends SearchEffect { private static final FilterCard filter = new FilterCard(); static { - filter.add(new SubtypePredicate(SubType.SPIRIT)); + filter.add(SubType.SPIRIT.getPredicate()); } public InameDeathAspectEffect() { diff --git a/Mage.Sets/src/mage/cards/i/InameLifeAspect.java b/Mage.Sets/src/mage/cards/i/InameLifeAspect.java index e9c8200ebb..91489ac7b0 100644 --- a/Mage.Sets/src/mage/cards/i/InameLifeAspect.java +++ b/Mage.Sets/src/mage/cards/i/InameLifeAspect.java @@ -17,7 +17,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; @@ -31,7 +30,7 @@ public final class InameLifeAspect extends CardImpl { private static final FilterCard filter = new FilterCard("Spirit cards from your graveyard"); static { - filter.add(new SubtypePredicate(SubType.SPIRIT)); + filter.add(SubType.SPIRIT.getPredicate()); } public InameLifeAspect(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IncandescentSoulstoke.java b/Mage.Sets/src/mage/cards/i/IncandescentSoulstoke.java index 609807b84d..f09466cb28 100644 --- a/Mage.Sets/src/mage/cards/i/IncandescentSoulstoke.java +++ b/Mage.Sets/src/mage/cards/i/IncandescentSoulstoke.java @@ -22,7 +22,6 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -38,7 +37,7 @@ public final class IncandescentSoulstoke extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Elemental creatures"); static { - filter.add(new SubtypePredicate(SubType.ELEMENTAL)); + filter.add(SubType.ELEMENTAL.getPredicate()); } public IncandescentSoulstoke(UUID ownerId, CardSetInfo setInfo) { @@ -92,7 +91,7 @@ class IncandescentSoulstokeEffect extends OneShotEffect { if (controller != null) { if (controller.chooseUse(Outcome.PutCreatureInPlay, choiceText, source, game)) { FilterCard filter = new FilterCreatureCard(); - filter.add(new SubtypePredicate((SubType.ELEMENTAL))); + filter.add(SubType.ELEMENTAL.getPredicate()); TargetCardInHand target = new TargetCardInHand(filter); if (controller.choose(Outcome.PutCreatureInPlay, target, source.getSourceId(), game)) { Card card = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/i/IndebtedSamurai.java b/Mage.Sets/src/mage/cards/i/IndebtedSamurai.java index 32f9455d36..562d26dcc7 100644 --- a/Mage.Sets/src/mage/cards/i/IndebtedSamurai.java +++ b/Mage.Sets/src/mage/cards/i/IndebtedSamurai.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -25,7 +24,7 @@ public final class IndebtedSamurai extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a Samurai you control"); static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.SAMURAI)); + filter.add(SubType.SAMURAI.getPredicate()); } public IndebtedSamurai(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IndulgentAristocrat.java b/Mage.Sets/src/mage/cards/i/IndulgentAristocrat.java index ec6c93cdd6..1c5c409990 100644 --- a/Mage.Sets/src/mage/cards/i/IndulgentAristocrat.java +++ b/Mage.Sets/src/mage/cards/i/IndulgentAristocrat.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; import java.util.UUID; @@ -29,7 +28,7 @@ public final class IndulgentAristocrat extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Vampire you control"); static { - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); } public IndulgentAristocrat(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/InfernalDenizen.java b/Mage.Sets/src/mage/cards/i/InfernalDenizen.java index c40383ccab..f4cd651874 100644 --- a/Mage.Sets/src/mage/cards/i/InfernalDenizen.java +++ b/Mage.Sets/src/mage/cards/i/InfernalDenizen.java @@ -25,7 +25,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; @@ -76,7 +75,7 @@ class InfernalDenizenEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterPermanent(); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/i/InfernalMedusa.java b/Mage.Sets/src/mage/cards/i/InfernalMedusa.java index a5552963b5..b3f0ab1912 100644 --- a/Mage.Sets/src/mage/cards/i/InfernalMedusa.java +++ b/Mage.Sets/src/mage/cards/i/InfernalMedusa.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class InfernalMedusa extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Wall creature"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.WALL))); + filter.add(Predicates.not(SubType.WALL.getPredicate())); } public InfernalMedusa(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/InformationDealer.java b/Mage.Sets/src/mage/cards/i/InformationDealer.java index 0da79b53c1..d7e585bec0 100644 --- a/Mage.Sets/src/mage/cards/i/InformationDealer.java +++ b/Mage.Sets/src/mage/cards/i/InformationDealer.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -25,7 +24,7 @@ public final class InformationDealer extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Wizards on the battlefield"); static { - filter.add(new SubtypePredicate(SubType.WIZARD)); + filter.add(SubType.WIZARD.getPredicate()); } public InformationDealer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/InnerDemon.java b/Mage.Sets/src/mage/cards/i/InnerDemon.java index 621e2c52fd..9b38e76d33 100644 --- a/Mage.Sets/src/mage/cards/i/InnerDemon.java +++ b/Mage.Sets/src/mage/cards/i/InnerDemon.java @@ -25,7 +25,6 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -36,7 +35,7 @@ public final class InnerDemon extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("all non-Demon creatures"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.DEMON))); + filter.add(Predicates.not(SubType.DEMON.getPredicate())); } public InnerDemon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/InspiredSprite.java b/Mage.Sets/src/mage/cards/i/InspiredSprite.java index 7f87cc324f..6468a2b334 100644 --- a/Mage.Sets/src/mage/cards/i/InspiredSprite.java +++ b/Mage.Sets/src/mage/cards/i/InspiredSprite.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -27,7 +26,7 @@ public final class InspiredSprite extends CardImpl { private static final FilterSpell filter = new FilterSpell("Wizard"); static { - filter.add(new SubtypePredicate(SubType.WIZARD)); + filter.add(SubType.WIZARD.getPredicate()); } public InspiredSprite(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/Invigorate.java b/Mage.Sets/src/mage/cards/i/Invigorate.java index c28d5aa007..ad4e2d3ab9 100644 --- a/Mage.Sets/src/mage/cards/i/Invigorate.java +++ b/Mage.Sets/src/mage/cards/i/Invigorate.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class Invigorate extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("If you control a Forest"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public Invigorate(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/Invisibility.java b/Mage.Sets/src/mage/cards/i/Invisibility.java index ac0017d0d6..46ff563904 100644 --- a/Mage.Sets/src/mage/cards/i/Invisibility.java +++ b/Mage.Sets/src/mage/cards/i/Invisibility.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -24,7 +23,7 @@ public final class Invisibility extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("except by Walls"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.WALL))); + filter.add(Predicates.not(SubType.WALL.getPredicate())); } public Invisibility(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IpnuRivulet.java b/Mage.Sets/src/mage/cards/i/IpnuRivulet.java index b9f94d606b..8584afd424 100644 --- a/Mage.Sets/src/mage/cards/i/IpnuRivulet.java +++ b/Mage.Sets/src/mage/cards/i/IpnuRivulet.java @@ -17,7 +17,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; @@ -30,7 +29,7 @@ public final class IpnuRivulet extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Desert"); static { - filter.add(new SubtypePredicate(SubType.DESERT)); + filter.add(SubType.DESERT.getPredicate()); } public IpnuRivulet(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IreOfKaminari.java b/Mage.Sets/src/mage/cards/i/IreOfKaminari.java index 61b291db69..f6500b68b0 100644 --- a/Mage.Sets/src/mage/cards/i/IreOfKaminari.java +++ b/Mage.Sets/src/mage/cards/i/IreOfKaminari.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetAnyTarget; import java.util.UUID; @@ -22,7 +21,7 @@ public final class IreOfKaminari extends CardImpl { private static final FilterCard filter = new FilterCard("Arcane"); static { - filter.add(new SubtypePredicate(SubType.ARCANE)); + filter.add(SubType.ARCANE.getPredicate()); } public IreOfKaminari(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IridescentDrake.java b/Mage.Sets/src/mage/cards/i/IridescentDrake.java index d9f08f524a..f817337242 100644 --- a/Mage.Sets/src/mage/cards/i/IridescentDrake.java +++ b/Mage.Sets/src/mage/cards/i/IridescentDrake.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.other.AuraCardCanAttachToPermanentId; import mage.game.Game; import mage.game.permanent.Permanent; @@ -32,7 +31,7 @@ public final class IridescentDrake extends CardImpl { private static final FilterCard filter = new FilterCard("Aura from a graveyard"); static { - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); } public IridescentDrake(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IronHeartChimera.java b/Mage.Sets/src/mage/cards/i/IronHeartChimera.java index d62c79c31f..5ce093f964 100644 --- a/Mage.Sets/src/mage/cards/i/IronHeartChimera.java +++ b/Mage.Sets/src/mage/cards/i/IronHeartChimera.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -30,7 +29,7 @@ public final class IronHeartChimera extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Chimera creature you control"); static { - filter.add(new SubtypePredicate(SubType.CHIMERA)); + filter.add(SubType.CHIMERA.getPredicate()); } public IronHeartChimera(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IroncladSlayer.java b/Mage.Sets/src/mage/cards/i/IroncladSlayer.java index 2a020c3865..a6dd275950 100644 --- a/Mage.Sets/src/mage/cards/i/IroncladSlayer.java +++ b/Mage.Sets/src/mage/cards/i/IroncladSlayer.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInYourGraveyard; /** @@ -25,7 +24,7 @@ public final class IroncladSlayer extends CardImpl { private static final FilterCard filter = new FilterCard("Aura or Equipment card from your graveyard"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.AURA), new SubtypePredicate(SubType.EQUIPMENT))); + filter.add(Predicates.or(SubType.AURA.getPredicate(), SubType.EQUIPMENT.getPredicate())); } public IroncladSlayer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IsaoEnlightenedBushi.java b/Mage.Sets/src/mage/cards/i/IsaoEnlightenedBushi.java index 6da9c4c6b9..7f69d6bb9f 100644 --- a/Mage.Sets/src/mage/cards/i/IsaoEnlightenedBushi.java +++ b/Mage.Sets/src/mage/cards/i/IsaoEnlightenedBushi.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -28,7 +27,7 @@ public final class IsaoEnlightenedBushi extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Samurai"); static { - filter.add(new SubtypePredicate(SubType.SAMURAI)); + filter.add(SubType.SAMURAI.getPredicate()); } public IsaoEnlightenedBushi(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IshkanahGrafwidow.java b/Mage.Sets/src/mage/cards/i/IshkanahGrafwidow.java index 0dd3df0283..994ca4574f 100644 --- a/Mage.Sets/src/mage/cards/i/IshkanahGrafwidow.java +++ b/Mage.Sets/src/mage/cards/i/IshkanahGrafwidow.java @@ -20,7 +20,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SpiderToken; import mage.target.common.TargetOpponent; @@ -34,7 +33,7 @@ public final class IshkanahGrafwidow extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Spider you control"); static { - filter.add(new SubtypePredicate(SubType.SPIDER)); + filter.add(SubType.SPIDER.getPredicate()); } public IshkanahGrafwidow(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IsolatedChapel.java b/Mage.Sets/src/mage/cards/i/IsolatedChapel.java index 82cd94f009..ee091eb3ce 100644 --- a/Mage.Sets/src/mage/cards/i/IsolatedChapel.java +++ b/Mage.Sets/src/mage/cards/i/IsolatedChapel.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -28,7 +27,7 @@ public final class IsolatedChapel extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.PLAINS), new SubtypePredicate(SubType.SWAMP))); + filter.add(Predicates.or(SubType.PLAINS.getPredicate(), SubType.SWAMP.getPredicate())); } public IsolatedChapel(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JacesDefeat.java b/Mage.Sets/src/mage/cards/j/JacesDefeat.java index 1906baf912..0d0d142f95 100644 --- a/Mage.Sets/src/mage/cards/j/JacesDefeat.java +++ b/Mage.Sets/src/mage/cards/j/JacesDefeat.java @@ -13,7 +13,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.stack.Spell; import mage.players.Player; @@ -55,7 +54,7 @@ class JacesDefeatEffect extends OneShotEffect { static { filter.add(CardType.PLANESWALKER.getPredicate()); - filter.add(new SubtypePredicate(SubType.JACE)); + filter.add(SubType.JACE.getPredicate()); } public JacesDefeatEffect() { diff --git a/Mage.Sets/src/mage/cards/j/JacesSentinel.java b/Mage.Sets/src/mage/cards/j/JacesSentinel.java index a2a70e354a..5dccc04c0f 100644 --- a/Mage.Sets/src/mage/cards/j/JacesSentinel.java +++ b/Mage.Sets/src/mage/cards/j/JacesSentinel.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; @@ -27,7 +26,7 @@ public final class JacesSentinel extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(CardType.PLANESWALKER.getPredicate()); - filter.add(new SubtypePredicate(SubType.JACE)); + filter.add(SubType.JACE.getPredicate()); } public JacesSentinel(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JadeBearer.java b/Mage.Sets/src/mage/cards/j/JadeBearer.java index 422df6fc88..cbd78921d8 100644 --- a/Mage.Sets/src/mage/cards/j/JadeBearer.java +++ b/Mage.Sets/src/mage/cards/j/JadeBearer.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -25,7 +24,7 @@ public final class JadeBearer extends CardImpl { private static final FilterCreaturePermanent filterYourAnotherMerfolk = new FilterCreaturePermanent(); static { filterYourAnotherMerfolk.add(AnotherPredicate.instance); - filterYourAnotherMerfolk.add(new SubtypePredicate(SubType.MERFOLK)); + filterYourAnotherMerfolk.add(SubType.MERFOLK.getPredicate()); filterYourAnotherMerfolk.add(new ControllerPredicate(TargetController.YOU)); filterYourAnotherMerfolk.setMessage("another " + SubType.MERFOLK.toString() + " you control"); } diff --git a/Mage.Sets/src/mage/cards/j/JaggedScarArchers.java b/Mage.Sets/src/mage/cards/j/JaggedScarArchers.java index a9bd7959d5..bff4c88713 100644 --- a/Mage.Sets/src/mage/cards/j/JaggedScarArchers.java +++ b/Mage.Sets/src/mage/cards/j/JaggedScarArchers.java @@ -21,7 +21,6 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -34,7 +33,7 @@ public final class JaggedScarArchers extends CardImpl { private static final FilterControlledPermanent controlledElvesFilter = new FilterControlledPermanent("Elves you control"); static { flyingCreatureFilter.add(new AbilityPredicate(FlyingAbility.class)); - controlledElvesFilter.add(new SubtypePredicate(SubType.ELF)); + controlledElvesFilter.add(SubType.ELF.getPredicate()); } public JaggedScarArchers(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java b/Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java index 761115fe64..b24218d174 100644 --- a/Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java +++ b/Mage.Sets/src/mage/cards/j/JaradGolgariLichLord.java @@ -18,7 +18,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetControlledPermanent; @@ -32,8 +31,8 @@ public final class JaradGolgariLichLord extends CardImpl { private static final FilterControlledPermanent filterForest = new FilterControlledPermanent("a Forest"); static { - filterSwamp.add(new SubtypePredicate(SubType.SWAMP)); - filterForest.add(new SubtypePredicate(SubType.FOREST)); + filterSwamp.add(SubType.SWAMP.getPredicate()); + filterForest.add(SubType.FOREST.getPredicate()); } public JaradGolgariLichLord(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JawsOfStone.java b/Mage.Sets/src/mage/cards/j/JawsOfStone.java index 90041056f2..521840b208 100644 --- a/Mage.Sets/src/mage/cards/j/JawsOfStone.java +++ b/Mage.Sets/src/mage/cards/j/JawsOfStone.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetAnyTargetAmount; /** @@ -22,7 +21,7 @@ public final class JawsOfStone extends CardImpl { static final private FilterControlledLandPermanent filter = new FilterControlledLandPermanent("mountains you control"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } static final private String rule = "{this} deals X damage divided as you choose among any number of target creatures and/or players, where X is the number of Mountains you control as you cast {this}"; diff --git a/Mage.Sets/src/mage/cards/j/JediEnclave.java b/Mage.Sets/src/mage/cards/j/JediEnclave.java index a6ea99522f..998f77e383 100644 --- a/Mage.Sets/src/mage/cards/j/JediEnclave.java +++ b/Mage.Sets/src/mage/cards/j/JediEnclave.java @@ -13,7 +13,6 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; @@ -60,9 +59,9 @@ public final class JediEnclave extends CardImpl { FilterCard filter = new FilterCard("basic Forest, Plains or Island"); filter.add(CardType.LAND.getPredicate()); List> subtypePredicates = new ArrayList<>(); - subtypePredicates.add(new SubtypePredicate(SubType.FOREST)); - subtypePredicates.add(new SubtypePredicate(SubType.PLAINS)); - subtypePredicates.add(new SubtypePredicate(SubType.ISLAND)); + subtypePredicates.add(SubType.FOREST.getPredicate()); + subtypePredicates.add(SubType.PLAINS.getPredicate()); + subtypePredicates.add(SubType.ISLAND.getPredicate()); filter.add(Predicates.or(subtypePredicates)); filter.add(new SupertypePredicate(SuperType.BASIC)); TargetCardInLibrary target = new TargetCardInLibrary(filter); diff --git a/Mage.Sets/src/mage/cards/j/JediStarfighter.java b/Mage.Sets/src/mage/cards/j/JediStarfighter.java index c08a31849e..c0f0e28f45 100644 --- a/Mage.Sets/src/mage/cards/j/JediStarfighter.java +++ b/Mage.Sets/src/mage/cards/j/JediStarfighter.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -28,7 +27,7 @@ public final class JediStarfighter extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Jedi creatures you control"); static { - filter.add(new SubtypePredicate(SubType.JEDI)); + filter.add(SubType.JEDI.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/j/JediTraining.java b/Mage.Sets/src/mage/cards/j/JediTraining.java index 1efcb1174d..7541618dcf 100644 --- a/Mage.Sets/src/mage/cards/j/JediTraining.java +++ b/Mage.Sets/src/mage/cards/j/JediTraining.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -28,7 +27,7 @@ public final class JediTraining extends CardImpl { protected static final FilterCard filter = new FilterCard("Jedi spells"); static { - filter.add(new SubtypePredicate(SubType.JEDI)); + filter.add(SubType.JEDI.getPredicate()); } public JediTraining(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JoragaBard.java b/Mage.Sets/src/mage/cards/j/JoragaBard.java index 0b1793f9af..720373d667 100644 --- a/Mage.Sets/src/mage/cards/j/JoragaBard.java +++ b/Mage.Sets/src/mage/cards/j/JoragaBard.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -25,7 +24,7 @@ public final class JoragaBard extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Ally creatures you control"); static { - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/j/JoragaTreespeaker.java b/Mage.Sets/src/mage/cards/j/JoragaTreespeaker.java index 461bb6ab02..541de9a932 100644 --- a/Mage.Sets/src/mage/cards/j/JoragaTreespeaker.java +++ b/Mage.Sets/src/mage/cards/j/JoragaTreespeaker.java @@ -22,7 +22,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** @@ -34,7 +33,7 @@ public final class JoragaTreespeaker extends LevelerCard { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Elves"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public JoragaTreespeaker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JoragaWarcaller.java b/Mage.Sets/src/mage/cards/j/JoragaWarcaller.java index ca2464b658..197506453c 100644 --- a/Mage.Sets/src/mage/cards/j/JoragaWarcaller.java +++ b/Mage.Sets/src/mage/cards/j/JoragaWarcaller.java @@ -15,7 +15,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -31,7 +30,7 @@ public final class JoragaWarcaller extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/j/JorubaiMurkLurker.java b/Mage.Sets/src/mage/cards/j/JorubaiMurkLurker.java index d8fba4b2ea..1e19594a15 100644 --- a/Mage.Sets/src/mage/cards/j/JorubaiMurkLurker.java +++ b/Mage.Sets/src/mage/cards/j/JorubaiMurkLurker.java @@ -19,7 +19,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -32,7 +31,7 @@ public final class JorubaiMurkLurker extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("a Swamp"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public JorubaiMurkLurker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JovensTools.java b/Mage.Sets/src/mage/cards/j/JovensTools.java index e361ca5de6..7080ac26de 100644 --- a/Mage.Sets/src/mage/cards/j/JovensTools.java +++ b/Mage.Sets/src/mage/cards/j/JovensTools.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -26,7 +25,7 @@ public final class JovensTools extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("except by walls"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.WALL))); + filter.add(Predicates.not(SubType.WALL.getPredicate())); } public JovensTools(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/Juggernaut.java b/Mage.Sets/src/mage/cards/j/Juggernaut.java index ec8663bf72..b947e2b268 100644 --- a/Mage.Sets/src/mage/cards/j/Juggernaut.java +++ b/Mage.Sets/src/mage/cards/j/Juggernaut.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -23,7 +22,7 @@ public final class Juggernaut extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Walls"); static { - filter.add(new SubtypePredicate(SubType.WALL)); + filter.add(SubType.WALL.getPredicate()); } public Juggernaut(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JumpTrooper.java b/Mage.Sets/src/mage/cards/j/JumpTrooper.java index 003b7c31dd..6f89fb4553 100644 --- a/Mage.Sets/src/mage/cards/j/JumpTrooper.java +++ b/Mage.Sets/src/mage/cards/j/JumpTrooper.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -29,7 +28,7 @@ public final class JumpTrooper extends CardImpl { private static final FilterCreatureCard filter = new FilterCreatureCard("Trooper creatures"); static { - filter.add(new SubtypePredicate(SubType.TROOPER)); + filter.add(SubType.TROOPER.getPredicate()); } public JumpTrooper(UUID ownerId, CardSetInfo setInfo) { @@ -59,7 +58,7 @@ class JumpTrooperTriggeredAbility extends TriggeredAbilityImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Trooper creature you control"); static { - filter.add(new SubtypePredicate(SubType.TROOPER)); + filter.add(SubType.TROOPER.getPredicate()); } public JumpTrooperTriggeredAbility(Effect effect) { diff --git a/Mage.Sets/src/mage/cards/j/JundPanorama.java b/Mage.Sets/src/mage/cards/j/JundPanorama.java index bba12389dd..d5c941b3c0 100644 --- a/Mage.Sets/src/mage/cards/j/JundPanorama.java +++ b/Mage.Sets/src/mage/cards/j/JundPanorama.java @@ -15,7 +15,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; @@ -31,9 +30,9 @@ public final class JundPanorama extends CardImpl { filter.add(CardType.LAND.getPredicate()); filter.add(new SupertypePredicate(SuperType.BASIC)); filter.add(Predicates.or( - new SubtypePredicate(SubType.SWAMP), - new SubtypePredicate(SubType.MOUNTAIN), - new SubtypePredicate(SubType.FOREST))); + SubType.SWAMP.getPredicate(), + SubType.MOUNTAIN.getPredicate(), + SubType.FOREST.getPredicate())); } public JundPanorama(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JungleBasin.java b/Mage.Sets/src/mage/cards/j/JungleBasin.java index e2ceca75b6..9e9869e3d1 100644 --- a/Mage.Sets/src/mage/cards/j/JungleBasin.java +++ b/Mage.Sets/src/mage/cards/j/JungleBasin.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -29,7 +28,7 @@ public final class JungleBasin extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("an untapped Forest"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/j/JungleVillage.java b/Mage.Sets/src/mage/cards/j/JungleVillage.java index 66fb45b060..32c7265bfb 100644 --- a/Mage.Sets/src/mage/cards/j/JungleVillage.java +++ b/Mage.Sets/src/mage/cards/j/JungleVillage.java @@ -13,7 +13,6 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; @@ -60,9 +59,9 @@ public final class JungleVillage extends CardImpl { FilterCard filter = new FilterCard("basic Mountain, Forest or Plains"); filter.add(CardType.LAND.getPredicate()); List> subtypePredicates = new ArrayList<>(); - subtypePredicates.add(new SubtypePredicate(SubType.PLAINS)); - subtypePredicates.add(new SubtypePredicate(SubType.MOUNTAIN)); - subtypePredicates.add(new SubtypePredicate(SubType.FAERIE)); + subtypePredicates.add(SubType.PLAINS.getPredicate()); + subtypePredicates.add(SubType.MOUNTAIN.getPredicate()); + subtypePredicates.add(SubType.FAERIE.getPredicate()); filter.add(Predicates.or(subtypePredicates)); filter.add(new SupertypePredicate(SuperType.BASIC)); TargetCardInLibrary target = new TargetCardInLibrary(filter); diff --git a/Mage.Sets/src/mage/cards/j/JwariShapeshifter.java b/Mage.Sets/src/mage/cards/j/JwariShapeshifter.java index f008bb922b..b73ab7509c 100644 --- a/Mage.Sets/src/mage/cards/j/JwariShapeshifter.java +++ b/Mage.Sets/src/mage/cards/j/JwariShapeshifter.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -22,7 +21,7 @@ public final class JwariShapeshifter extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Ally creature"); static { - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); filter.add(CardType.CREATURE.getPredicate()); filter.add(AnotherPredicate.instance); // needed because during enters_the_battlefield event the creature is already targetable although it shouldn't } diff --git a/Mage.Sets/src/mage/cards/k/KaaliaOfTheVast.java b/Mage.Sets/src/mage/cards/k/KaaliaOfTheVast.java index 13c605f216..3615a8eeba 100644 --- a/Mage.Sets/src/mage/cards/k/KaaliaOfTheVast.java +++ b/Mage.Sets/src/mage/cards/k/KaaliaOfTheVast.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -98,9 +97,9 @@ class KaaliaOfTheVastEffect extends OneShotEffect { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.ANGEL), - new SubtypePredicate(SubType.DEMON), - new SubtypePredicate(SubType.DRAGON))); + SubType.ANGEL.getPredicate(), + SubType.DEMON.getPredicate(), + SubType.DRAGON.getPredicate())); } public KaaliaOfTheVastEffect() { diff --git a/Mage.Sets/src/mage/cards/k/KaaliaZenithSeeker.java b/Mage.Sets/src/mage/cards/k/KaaliaZenithSeeker.java index 527e6b533a..bac92417d1 100644 --- a/Mage.Sets/src/mage/cards/k/KaaliaZenithSeeker.java +++ b/Mage.Sets/src/mage/cards/k/KaaliaZenithSeeker.java @@ -13,7 +13,6 @@ import mage.cards.Cards; import mage.cards.CardsImpl; import mage.constants.*; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; @@ -64,7 +63,7 @@ class KaaliaZenithSeekerEffect extends OneShotEffect { private CreatureFinder(SubType subType) { this.filterCard = new FilterCard("a " + subType.toString() + " card"); - this.filterCard.add(new SubtypePredicate(subType)); + this.filterCard.add(subType.getPredicate()); } private TargetCard getTarget() { diff --git a/Mage.Sets/src/mage/cards/k/KabiraEvangel.java b/Mage.Sets/src/mage/cards/k/KabiraEvangel.java index 9dd653bb87..a4b649348e 100644 --- a/Mage.Sets/src/mage/cards/k/KabiraEvangel.java +++ b/Mage.Sets/src/mage/cards/k/KabiraEvangel.java @@ -16,7 +16,6 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardIdPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -27,7 +26,7 @@ public final class KabiraEvangel extends CardImpl { private static final FilterControlledCreaturePermanent FILTER1 = new FilterControlledCreaturePermanent(); static { - FILTER1.add(new SubtypePredicate(SubType.ALLY)); + FILTER1.add(SubType.ALLY.getPredicate()); } public KabiraEvangel(UUID ownerId, CardSetInfo setInfo) { @@ -40,7 +39,7 @@ public final class KabiraEvangel extends CardImpl { this.toughness = new MageInt(3); FilterPermanent filter2 = new FilterPermanent(getName() + " or another Ally"); - filter2.add(Predicates.or(new CardIdPredicate(this.getId()), new SubtypePredicate(SubType.ALLY))); + filter2.add(Predicates.or(new CardIdPredicate(this.getId()), SubType.ALLY.getPredicate())); // Whenever Kabira Evangel or another Ally enters the battlefield under your control, you may choose a color. If you do, Allies you control gain protection from the chosen color until end of turn. Effect effect = new GainProtectionFromColorAllEffect(Duration.EndOfTurn, FILTER1); diff --git a/Mage.Sets/src/mage/cards/k/KalastriaHighborn.java b/Mage.Sets/src/mage/cards/k/KalastriaHighborn.java index 101d343150..b2fc93f3ab 100644 --- a/Mage.Sets/src/mage/cards/k/KalastriaHighborn.java +++ b/Mage.Sets/src/mage/cards/k/KalastriaHighborn.java @@ -15,7 +15,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.players.Player; @@ -30,7 +29,7 @@ public final class KalastriaHighborn extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Vampire you control"); static { - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java b/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java index a8dc5ad756..ad4a1b90d1 100644 --- a/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java +++ b/Mage.Sets/src/mage/cards/k/KalitasTraitorOfGhet.java @@ -18,7 +18,6 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -38,8 +37,8 @@ public final class KalitasTraitorOfGhet extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(Predicates.or(new SubtypePredicate(SubType.VAMPIRE), - (new SubtypePredicate(SubType.ZOMBIE)))); + filter.add(Predicates.or(SubType.VAMPIRE.getPredicate(), + (SubType.ZOMBIE.getPredicate()))); } public KalitasTraitorOfGhet(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KalonianTwingrove.java b/Mage.Sets/src/mage/cards/k/KalonianTwingrove.java index e4628b3045..2ea412274b 100644 --- a/Mage.Sets/src/mage/cards/k/KalonianTwingrove.java +++ b/Mage.Sets/src/mage/cards/k/KalonianTwingrove.java @@ -11,13 +11,11 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import static mage.cards.k.KalonianTwingrove.filterLands; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.KalonianTwingroveTreefolkWarriorToken; /** @@ -29,7 +27,7 @@ public final class KalonianTwingrove extends CardImpl { static final FilterControlledPermanent filterLands = new FilterControlledPermanent("Forests you control"); static { - filterLands.add(new SubtypePredicate(SubType.FOREST)); + filterLands.add(SubType.FOREST.getPredicate()); } public KalonianTwingrove(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KaminoCloningFacility.java b/Mage.Sets/src/mage/cards/k/KaminoCloningFacility.java index cddbe090dd..a50d06e0bf 100644 --- a/Mage.Sets/src/mage/cards/k/KaminoCloningFacility.java +++ b/Mage.Sets/src/mage/cards/k/KaminoCloningFacility.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.TrooperToken; /** @@ -28,7 +27,7 @@ public final class KaminoCloningFacility extends CardImpl { private static final FilterSpell FILTER = new FilterSpell("a Trooper spell"); static { - FILTER.add(new SubtypePredicate(SubType.TROOPER)); + FILTER.add(SubType.TROOPER.getPredicate()); } public KaminoCloningFacility(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java b/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java index 79b0923feb..0396b88cab 100644 --- a/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java +++ b/Mage.Sets/src/mage/cards/k/KangeeAerieKeeper.java @@ -17,7 +17,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import java.util.UUID; @@ -30,7 +29,7 @@ public final class KangeeAerieKeeper extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Bird creatures"); static { - filter.add(new SubtypePredicate(SubType.BIRD)); + filter.add(SubType.BIRD.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/k/KarametraGodOfHarvests.java b/Mage.Sets/src/mage/cards/k/KarametraGodOfHarvests.java index e871deb41d..051bd06813 100644 --- a/Mage.Sets/src/mage/cards/k/KarametraGodOfHarvests.java +++ b/Mage.Sets/src/mage/cards/k/KarametraGodOfHarvests.java @@ -15,7 +15,6 @@ import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; import java.util.UUID; @@ -29,8 +28,8 @@ public final class KarametraGodOfHarvests extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.FOREST), - new SubtypePredicate(SubType.PLAINS) + SubType.FOREST.getPredicate(), + SubType.PLAINS.getPredicate() )); } diff --git a/Mage.Sets/src/mage/cards/k/KariZevsExpertise.java b/Mage.Sets/src/mage/cards/k/KariZevsExpertise.java index 1cf77e1913..e827b9021c 100644 --- a/Mage.Sets/src/mage/cards/k/KariZevsExpertise.java +++ b/Mage.Sets/src/mage/cards/k/KariZevsExpertise.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -27,7 +26,7 @@ public final class KariZevsExpertise extends CardImpl { static { filter.add(Predicates.or(CardType.CREATURE.getPredicate(), - new SubtypePredicate(SubType.VEHICLE))); + SubType.VEHICLE.getPredicate())); } public KariZevsExpertise(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/Karma.java b/Mage.Sets/src/mage/cards/k/Karma.java index 622ab96aa2..3efa30a82d 100644 --- a/Mage.Sets/src/mage/cards/k/Karma.java +++ b/Mage.Sets/src/mage/cards/k/Karma.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; @@ -48,7 +47,7 @@ class KarmaDamageTargetEffect extends OneShotEffect{ private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("Swamps"); static{ - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public KarmaDamageTargetEffect() diff --git a/Mage.Sets/src/mage/cards/k/KaronaFalseGod.java b/Mage.Sets/src/mage/cards/k/KaronaFalseGod.java index b338d4cf51..00a89c966f 100644 --- a/Mage.Sets/src/mage/cards/k/KaronaFalseGod.java +++ b/Mage.Sets/src/mage/cards/k/KaronaFalseGod.java @@ -18,7 +18,6 @@ import mage.choices.Choice; import mage.choices.ChoiceCreatureType; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -134,7 +133,7 @@ class KaronaFalseGodEffect extends OneShotEffect { if (!typeChosen.isEmpty()) { game.informPlayers(controller.getLogName() + " has chosen " + typeChosen); FilterCreaturePermanent filter = new FilterCreaturePermanent(); - filter.add(new SubtypePredicate(SubType.byDescription(typeChosen))); + filter.add(SubType.byDescription(typeChosen).getPredicate()); game.addEffect(new BoostAllEffect(3, 3, Duration.EndOfTurn, filter, false), source); } return true; diff --git a/Mage.Sets/src/mage/cards/k/Karoo.java b/Mage.Sets/src/mage/cards/k/Karoo.java index 61cb7560d3..d2cda91d0c 100644 --- a/Mage.Sets/src/mage/cards/k/Karoo.java +++ b/Mage.Sets/src/mage/cards/k/Karoo.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -29,7 +28,7 @@ public final class Karoo extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("an untapped Plains"); static { - filter.add(new SubtypePredicate(SubType.PLAINS)); + filter.add(SubType.PLAINS.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/k/KarplusanHound.java b/Mage.Sets/src/mage/cards/k/KarplusanHound.java index 3a47691566..1d0077baa7 100644 --- a/Mage.Sets/src/mage/cards/k/KarplusanHound.java +++ b/Mage.Sets/src/mage/cards/k/KarplusanHound.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterPlaneswalkerPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetAnyTarget; /** @@ -29,7 +28,7 @@ public final class KarplusanHound extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(3); FilterPlaneswalkerPermanent filter = new FilterPlaneswalkerPermanent("a Chandra planeswalker"); - filter.add(new SubtypePredicate(SubType.CHANDRA)); + filter.add(SubType.CHANDRA.getPredicate()); // Whenever Karplusan Hound attacks, if you control a Chandra planeswalker, this creature deals 2 damage to any target. Ability ability = new ConditionalInterveningIfTriggeredAbility( new AttacksTriggeredAbility(new DamageTargetEffect(2), false), diff --git a/Mage.Sets/src/mage/cards/k/KarrthusTyrantOfJund.java b/Mage.Sets/src/mage/cards/k/KarrthusTyrantOfJund.java index 949e636e44..da9d64e41a 100644 --- a/Mage.Sets/src/mage/cards/k/KarrthusTyrantOfJund.java +++ b/Mage.Sets/src/mage/cards/k/KarrthusTyrantOfJund.java @@ -18,7 +18,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -34,7 +33,7 @@ public final class KarrthusTyrantOfJund extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } public KarrthusTyrantOfJund(UUID ownerId, CardSetInfo setInfo) { @@ -87,7 +86,7 @@ class KarrthusEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { FilterPermanent filter = new FilterPermanent(); - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); List dragons = game.getBattlefield().getAllActivePermanents(filter, game); for (Permanent dragon : dragons) { ContinuousEffect effect = new KarrthusControlEffect(source.getControllerId()); diff --git a/Mage.Sets/src/mage/cards/k/KashiTribeElite.java b/Mage.Sets/src/mage/cards/k/KashiTribeElite.java index 3b4221a01f..3aa21869c8 100644 --- a/Mage.Sets/src/mage/cards/k/KashiTribeElite.java +++ b/Mage.Sets/src/mage/cards/k/KashiTribeElite.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; /** @@ -27,7 +26,7 @@ public final class KashiTribeElite extends CardImpl { static { filter.add(new SupertypePredicate(SuperType.LEGENDARY)); - filter.add(new SubtypePredicate(SubType.SNAKE)); + filter.add(SubType.SNAKE.getPredicate()); } public KashiTribeElite(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KavuHowler.java b/Mage.Sets/src/mage/cards/k/KavuHowler.java index c12e5eb3e5..92cb5dea58 100644 --- a/Mage.Sets/src/mage/cards/k/KavuHowler.java +++ b/Mage.Sets/src/mage/cards/k/KavuHowler.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class KavuHowler extends CardImpl { private static final FilterCard filter = new FilterCard("Kavu cards"); static { - filter.add(new SubtypePredicate(SubType.KAVU)); + filter.add(SubType.KAVU.getPredicate()); } public KavuHowler(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KavuMauler.java b/Mage.Sets/src/mage/cards/k/KavuMauler.java index 5b949f2284..40c0b71fbc 100644 --- a/Mage.Sets/src/mage/cards/k/KavuMauler.java +++ b/Mage.Sets/src/mage/cards/k/KavuMauler.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -25,7 +24,7 @@ public final class KavuMauler extends CardImpl { private static final FilterAttackingCreature filter = new FilterAttackingCreature("other attacking Kavu"); static { - filter.add(new SubtypePredicate(SubType.KAVU)); + filter.add(SubType.KAVU.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/k/KavuMonarch.java b/Mage.Sets/src/mage/cards/k/KavuMonarch.java index 0aebfe4a2c..bbf5542de6 100644 --- a/Mage.Sets/src/mage/cards/k/KavuMonarch.java +++ b/Mage.Sets/src/mage/cards/k/KavuMonarch.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -29,8 +28,8 @@ public final class KavuMonarch extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("another Kavu"); static { - filter1.add(new SubtypePredicate(SubType.KAVU)); - filter2.add(new SubtypePredicate(SubType.KAVU)); + filter1.add(SubType.KAVU.getPredicate()); + filter2.add(SubType.KAVU.getPredicate()); filter2.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/k/KazuulWarlord.java b/Mage.Sets/src/mage/cards/k/KazuulWarlord.java index c11d6f41b7..cbf43776ed 100644 --- a/Mage.Sets/src/mage/cards/k/KazuulWarlord.java +++ b/Mage.Sets/src/mage/cards/k/KazuulWarlord.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -24,7 +23,7 @@ public final class KazuulWarlord extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Ally creatures you control"); static { - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/k/KazuulsTollCollector.java b/Mage.Sets/src/mage/cards/k/KazuulsTollCollector.java index f6c79d3e6c..a1e79f6ba1 100644 --- a/Mage.Sets/src/mage/cards/k/KazuulsTollCollector.java +++ b/Mage.Sets/src/mage/cards/k/KazuulsTollCollector.java @@ -14,7 +14,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledPermanent; @@ -28,7 +27,7 @@ public final class KazuulsTollCollector extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Equipment you control"); static { - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); } public KazuulsTollCollector(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KeeperOfProgenitus.java b/Mage.Sets/src/mage/cards/k/KeeperOfProgenitus.java index 627d7e8f3f..0ef2aa2d81 100644 --- a/Mage.Sets/src/mage/cards/k/KeeperOfProgenitus.java +++ b/Mage.Sets/src/mage/cards/k/KeeperOfProgenitus.java @@ -12,7 +12,6 @@ import mage.constants.SetTargetPointer; import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,9 +23,9 @@ public final class KeeperOfProgenitus extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.MOUNTAIN), - new SubtypePredicate(SubType.FOREST), - new SubtypePredicate(SubType.PLAINS) + SubType.MOUNTAIN.getPredicate(), + SubType.FOREST.getPredicate(), + SubType.PLAINS.getPredicate() )); } diff --git a/Mage.Sets/src/mage/cards/k/KeeperOfTheNineGales.java b/Mage.Sets/src/mage/cards/k/KeeperOfTheNineGales.java index 9ced360768..0a22dd567d 100644 --- a/Mage.Sets/src/mage/cards/k/KeeperOfTheNineGales.java +++ b/Mage.Sets/src/mage/cards/k/KeeperOfTheNineGales.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; @@ -31,7 +30,7 @@ public final class KeeperOfTheNineGales extends CardImpl { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new SubtypePredicate(SubType.BIRD)); + filter.add(SubType.BIRD.getPredicate()); } public KeeperOfTheNineGales(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KeepsakeGorgon.java b/Mage.Sets/src/mage/cards/k/KeepsakeGorgon.java index ad1eddc4c8..14abf44dbb 100644 --- a/Mage.Sets/src/mage/cards/k/KeepsakeGorgon.java +++ b/Mage.Sets/src/mage/cards/k/KeepsakeGorgon.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; @@ -28,7 +27,7 @@ public final class KeepsakeGorgon extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Gorgon creature an opponent controls"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.GORGON))); + filter.add(Predicates.not(SubType.GORGON.getPredicate())); filter.add(new ControllerPredicate(TargetController.OPPONENT)); } diff --git a/Mage.Sets/src/mage/cards/k/KeldonWarcaller.java b/Mage.Sets/src/mage/cards/k/KeldonWarcaller.java index 4f29a7b2a3..7989f27e36 100644 --- a/Mage.Sets/src/mage/cards/k/KeldonWarcaller.java +++ b/Mage.Sets/src/mage/cards/k/KeldonWarcaller.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -24,7 +23,7 @@ public final class KeldonWarcaller extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Saga you control"); static { - filter.add(new SubtypePredicate(SubType.SAGA)); + filter.add(SubType.SAGA.getPredicate()); } public KeldonWarcaller(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KeldonWarlord.java b/Mage.Sets/src/mage/cards/k/KeldonWarlord.java index 57e484b738..c08bf3c387 100644 --- a/Mage.Sets/src/mage/cards/k/KeldonWarlord.java +++ b/Mage.Sets/src/mage/cards/k/KeldonWarlord.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -25,7 +24,7 @@ public final class KeldonWarlord extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("non-Wall creatures you control."); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.WALL))); + filter.add(Predicates.not(SubType.WALL.getPredicate())); } public KeldonWarlord(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KentaroTheSmilingCat.java b/Mage.Sets/src/mage/cards/k/KentaroTheSmilingCat.java index 2f3fd80375..fe292620f6 100644 --- a/Mage.Sets/src/mage/cards/k/KentaroTheSmilingCat.java +++ b/Mage.Sets/src/mage/cards/k/KentaroTheSmilingCat.java @@ -16,7 +16,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; @@ -58,7 +57,7 @@ class KentaroTheSmilingCatCastingEffect extends ContinuousEffectImpl { private static final FilterCard filterSamurai = new FilterCard(); static { - filterSamurai.add(new SubtypePredicate(SubType.SAMURAI)); + filterSamurai.add(SubType.SAMURAI.getPredicate()); } static final AlternativeCostSourceAbility alternativeCastingCostAbility = new AlternativeCostSourceAbility( diff --git a/Mage.Sets/src/mage/cards/k/KessigMalcontents.java b/Mage.Sets/src/mage/cards/k/KessigMalcontents.java index 3259da476e..3b754e3316 100644 --- a/Mage.Sets/src/mage/cards/k/KessigMalcontents.java +++ b/Mage.Sets/src/mage/cards/k/KessigMalcontents.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetPlayerOrPlaneswalker; /** @@ -23,7 +22,7 @@ public final class KessigMalcontents extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Humans you control"); static { - filter.add(new SubtypePredicate(SubType.HUMAN)); + filter.add(SubType.HUMAN.getPredicate()); } public KessigMalcontents(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KindredCharge.java b/Mage.Sets/src/mage/cards/k/KindredCharge.java index 7702fbfbb7..9f6ab8c0b5 100644 --- a/Mage.Sets/src/mage/cards/k/KindredCharge.java +++ b/Mage.Sets/src/mage/cards/k/KindredCharge.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -72,7 +71,7 @@ class KindredChargeEffect extends OneShotEffect { SubType subType = ChooseCreatureTypeEffect.getChosenCreatureType(source.getSourceId(), game); if (subType != null) { FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature you control of the chosen type"); - filter.add(new SubtypePredicate(subType)); + filter.add(subType.getPredicate()); for (Permanent permanent : game.getBattlefield().getAllActivePermanents(filter, controller.getId(), game)) { if (permanent != null) { CreateTokenCopyTargetEffect effect = new CreateTokenCopyTargetEffect(source.getControllerId(), null, true); diff --git a/Mage.Sets/src/mage/cards/k/KindredDominance.java b/Mage.Sets/src/mage/cards/k/KindredDominance.java index 874760f0d9..d6ce168467 100644 --- a/Mage.Sets/src/mage/cards/k/KindredDominance.java +++ b/Mage.Sets/src/mage/cards/k/KindredDominance.java @@ -14,7 +14,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; @@ -64,7 +63,7 @@ class KindredDominanceEffect extends OneShotEffect { if (controller != null && controller.choose(outcome, typeChoice, game)) { game.informPlayers(controller.getLogName() + " has chosen " + typeChoice.getChoice()); FilterCreaturePermanent filter = new FilterCreaturePermanent("All creatures not of the chosen type"); - filter.add(Predicates.not(new SubtypePredicate(SubType.byDescription(typeChoice.getChoice())))); + filter.add(Predicates.not(SubType.byDescription(typeChoice.getChoice()).getPredicate())); return new DestroyAllEffect(filter).apply(game, source); } return false; diff --git a/Mage.Sets/src/mage/cards/k/KindredSummons.java b/Mage.Sets/src/mage/cards/k/KindredSummons.java index f263284c18..85fb3d94f3 100644 --- a/Mage.Sets/src/mage/cards/k/KindredSummons.java +++ b/Mage.Sets/src/mage/cards/k/KindredSummons.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; @@ -74,13 +73,13 @@ class KindredSummonsEffect extends OneShotEffect { return false; } FilterControlledCreaturePermanent filterPermanent = new FilterControlledCreaturePermanent("creature you control of the chosen type"); - filterPermanent.add(new SubtypePredicate(subType)); + filterPermanent.add(subType.getPredicate()); int numberOfCards = game.getBattlefield().countAll(filterPermanent, source.getControllerId(), game); Cards revealed = new CardsImpl(); Set chosenSubtypeCreatureCards = new LinkedHashSet<>(); Cards otherCards = new CardsImpl(); FilterCreatureCard filterCard = new FilterCreatureCard("creature card of the chosen type"); - filterCard.add(new SubtypePredicate(subType)); + filterCard.add(subType.getPredicate()); if (numberOfCards == 0) { // no matches so nothing is revealed game.informPlayers("There are 0 creature cards of the chosen type in " + controller.getName() + "'s library."); return true; diff --git a/Mage.Sets/src/mage/cards/k/KingSuleiman.java b/Mage.Sets/src/mage/cards/k/KingSuleiman.java index b3ea6d5648..7091d20227 100644 --- a/Mage.Sets/src/mage/cards/k/KingSuleiman.java +++ b/Mage.Sets/src/mage/cards/k/KingSuleiman.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import java.util.UUID; @@ -26,8 +25,8 @@ public final class KingSuleiman extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.DJINN), - new SubtypePredicate(SubType.EFREET) + SubType.DJINN.getPredicate(), + SubType.EFREET.getPredicate() )); } diff --git a/Mage.Sets/src/mage/cards/k/KinjallisCaller.java b/Mage.Sets/src/mage/cards/k/KinjallisCaller.java index 2a675c5a3f..09aafffc77 100644 --- a/Mage.Sets/src/mage/cards/k/KinjallisCaller.java +++ b/Mage.Sets/src/mage/cards/k/KinjallisCaller.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class KinjallisCaller extends CardImpl { private static final FilterCard filter = new FilterCard("Dinosaur spells"); static { - filter.add(new SubtypePredicate(SubType.DINOSAUR)); + filter.add(SubType.DINOSAUR.getPredicate()); } public KinjallisCaller(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KinsbaileBorderguard.java b/Mage.Sets/src/mage/cards/k/KinsbaileBorderguard.java index 04439710b8..d8134ac438 100644 --- a/Mage.Sets/src/mage/cards/k/KinsbaileBorderguard.java +++ b/Mage.Sets/src/mage/cards/k/KinsbaileBorderguard.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.counters.Counter; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.KithkinToken; @@ -32,7 +31,7 @@ public final class KinsbaileBorderguard extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent(); static { - filter.add(new SubtypePredicate(SubType.KITHKIN)); + filter.add(SubType.KITHKIN.getPredicate()); } public KinsbaileBorderguard(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KinsbaileCavalier.java b/Mage.Sets/src/mage/cards/k/KinsbaileCavalier.java index bacc2f4027..74d259ea35 100644 --- a/Mage.Sets/src/mage/cards/k/KinsbaileCavalier.java +++ b/Mage.Sets/src/mage/cards/k/KinsbaileCavalier.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class KinsbaileCavalier extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Knight creatures"); static { - filter.add(new SubtypePredicate(SubType.KNIGHT)); + filter.add(SubType.KNIGHT.getPredicate()); } public KinsbaileCavalier(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KirdApe.java b/Mage.Sets/src/mage/cards/k/KirdApe.java index 582e433449..0726717e76 100644 --- a/Mage.Sets/src/mage/cards/k/KirdApe.java +++ b/Mage.Sets/src/mage/cards/k/KirdApe.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class KirdApe extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("a Forest"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public KirdApe(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KirdChieftain.java b/Mage.Sets/src/mage/cards/k/KirdChieftain.java index 838cbe2bf8..6458192813 100644 --- a/Mage.Sets/src/mage/cards/k/KirdChieftain.java +++ b/Mage.Sets/src/mage/cards/k/KirdChieftain.java @@ -21,7 +21,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -34,7 +33,7 @@ public final class KirdChieftain extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("a Forest"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public KirdChieftain(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KithkinGreatheart.java b/Mage.Sets/src/mage/cards/k/KithkinGreatheart.java index 66ae1ba8bc..8ec5942139 100644 --- a/Mage.Sets/src/mage/cards/k/KithkinGreatheart.java +++ b/Mage.Sets/src/mage/cards/k/KithkinGreatheart.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -26,7 +25,7 @@ public final class KithkinGreatheart extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Giant"); static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.GIANT)); + filter.add(SubType.GIANT.getPredicate()); } private static final String rule2 = "As long as you control a Giant, {this} has first strike"; diff --git a/Mage.Sets/src/mage/cards/k/KithkinHarbinger.java b/Mage.Sets/src/mage/cards/k/KithkinHarbinger.java index cc721e6a7e..6548d15dcf 100644 --- a/Mage.Sets/src/mage/cards/k/KithkinHarbinger.java +++ b/Mage.Sets/src/mage/cards/k/KithkinHarbinger.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -22,7 +21,7 @@ public final class KithkinHarbinger extends CardImpl { static final FilterCard filter = new FilterCard("Kithkin card"); static { - filter.add(new SubtypePredicate(SubType.KITHKIN)); + filter.add(SubType.KITHKIN.getPredicate()); } public KithkinHarbinger(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KithkinMourncaller.java b/Mage.Sets/src/mage/cards/k/KithkinMourncaller.java index 9e792b5478..1dce8ae735 100644 --- a/Mage.Sets/src/mage/cards/k/KithkinMourncaller.java +++ b/Mage.Sets/src/mage/cards/k/KithkinMourncaller.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterAttackingCreature; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class KithkinMourncaller extends CardImpl { private static final FilterAttackingCreature filter = new FilterAttackingCreature("an attacking Kithkin or Elf"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.KITHKIN), new SubtypePredicate(SubType.ELF))); + filter.add(Predicates.or(SubType.KITHKIN.getPredicate(), SubType.ELF.getPredicate())); } public KithkinMourncaller(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KitsuneDiviner.java b/Mage.Sets/src/mage/cards/k/KitsuneDiviner.java index 9b7ffa79eb..42014993bd 100644 --- a/Mage.Sets/src/mage/cards/k/KitsuneDiviner.java +++ b/Mage.Sets/src/mage/cards/k/KitsuneDiviner.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -26,7 +25,7 @@ public final class KitsuneDiviner extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Spirit"); static { - filter.add(new SubtypePredicate(SubType.SPIRIT)); + filter.add(SubType.SPIRIT.getPredicate()); } public KitsuneDiviner (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KitsuneMystic.java b/Mage.Sets/src/mage/cards/k/KitsuneMystic.java index 0685884b6d..fe59abb96b 100644 --- a/Mage.Sets/src/mage/cards/k/KitsuneMystic.java +++ b/Mage.Sets/src/mage/cards/k/KitsuneMystic.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.predicate.mageobject.AttachmentAttachedToCardTypePredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -62,7 +61,7 @@ class AutumnTailKitsuneSage extends TokenImpl { static { filter.add(new AttachmentAttachedToCardTypePredicate(CardType.CREATURE)); - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); } AutumnTailKitsuneSage() { diff --git a/Mage.Sets/src/mage/cards/k/KitsuneRiftwalker.java b/Mage.Sets/src/mage/cards/k/KitsuneRiftwalker.java index 753c648205..14de7945b4 100644 --- a/Mage.Sets/src/mage/cards/k/KitsuneRiftwalker.java +++ b/Mage.Sets/src/mage/cards/k/KitsuneRiftwalker.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -21,7 +20,7 @@ public final class KitsuneRiftwalker extends CardImpl { private static final FilterCard filter = new FilterCard("Spirits and from Arcane"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.ARCANE), new SubtypePredicate(SubType.SPIRIT))); + filter.add(Predicates.or(SubType.ARCANE.getPredicate(), SubType.SPIRIT.getPredicate())); } public KitsuneRiftwalker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KjeldoranOutpost.java b/Mage.Sets/src/mage/cards/k/KjeldoranOutpost.java index 6e66afab70..21d4499023 100644 --- a/Mage.Sets/src/mage/cards/k/KjeldoranOutpost.java +++ b/Mage.Sets/src/mage/cards/k/KjeldoranOutpost.java @@ -17,7 +17,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SoldierToken; import mage.target.common.TargetControlledPermanent; @@ -30,7 +29,7 @@ public final class KjeldoranOutpost extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Plains"); static { - filter.add(new SubtypePredicate(SubType.PLAINS)); + filter.add(SubType.PLAINS.getPredicate()); } public KjeldoranOutpost(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KnightCaptainOfEos.java b/Mage.Sets/src/mage/cards/k/KnightCaptainOfEos.java index 30a1e27261..73d62663b8 100644 --- a/Mage.Sets/src/mage/cards/k/KnightCaptainOfEos.java +++ b/Mage.Sets/src/mage/cards/k/KnightCaptainOfEos.java @@ -16,7 +16,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SoldierToken; import mage.target.common.TargetControlledCreaturePermanent; @@ -29,7 +28,7 @@ public final class KnightCaptainOfEos extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a Soldier"); static { - filter.add(new SubtypePredicate(SubType.SOLDIER)); + filter.add(SubType.SOLDIER.getPredicate()); } public KnightCaptainOfEos(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KnightExemplar.java b/Mage.Sets/src/mage/cards/k/KnightExemplar.java index 9c069322b6..5b930d3979 100644 --- a/Mage.Sets/src/mage/cards/k/KnightExemplar.java +++ b/Mage.Sets/src/mage/cards/k/KnightExemplar.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -27,7 +26,7 @@ public final class KnightExemplar extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Knight creatures"); static { - filter.add(new SubtypePredicate(SubType.KNIGHT)); + filter.add(SubType.KNIGHT.getPredicate()); } public KnightExemplar(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KnightOfTheReliquary.java b/Mage.Sets/src/mage/cards/k/KnightOfTheReliquary.java index 6ebf5e6d1a..aa49b9171b 100644 --- a/Mage.Sets/src/mage/cards/k/KnightOfTheReliquary.java +++ b/Mage.Sets/src/mage/cards/k/KnightOfTheReliquary.java @@ -20,7 +20,6 @@ import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterLandCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledPermanent; @@ -33,7 +32,7 @@ public final class KnightOfTheReliquary extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("Forest or Plains"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.FOREST), new SubtypePredicate(SubType.PLAINS))); + filter.add(Predicates.or(SubType.FOREST.getPredicate(), SubType.PLAINS.getPredicate())); } public KnightOfTheReliquary(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KnightOfTheStampede.java b/Mage.Sets/src/mage/cards/k/KnightOfTheStampede.java index 510876cf6d..5eef08c56f 100644 --- a/Mage.Sets/src/mage/cards/k/KnightOfTheStampede.java +++ b/Mage.Sets/src/mage/cards/k/KnightOfTheStampede.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class KnightOfTheStampede extends CardImpl { private static final FilterCard filter = new FilterCard("Dinosaur spells"); static { - filter.add(new SubtypePredicate(SubType.DINOSAUR)); + filter.add(SubType.DINOSAUR.getPredicate()); } public KnightOfTheStampede(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KnuckleboneWitch.java b/Mage.Sets/src/mage/cards/k/KnuckleboneWitch.java index caa14c65b0..0bc46e1656 100644 --- a/Mage.Sets/src/mage/cards/k/KnuckleboneWitch.java +++ b/Mage.Sets/src/mage/cards/k/KnuckleboneWitch.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -25,7 +24,7 @@ public final class KnuckleboneWitch extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public KnuckleboneWitch(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KoboldDrillSergeant.java b/Mage.Sets/src/mage/cards/k/KoboldDrillSergeant.java index 29a84f4402..e269ac1ed3 100644 --- a/Mage.Sets/src/mage/cards/k/KoboldDrillSergeant.java +++ b/Mage.Sets/src/mage/cards/k/KoboldDrillSergeant.java @@ -16,7 +16,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -27,7 +26,7 @@ public final class KoboldDrillSergeant extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Kobold creatures"); static { - filter.add(new SubtypePredicate(SubType.KOBOLD)); + filter.add(SubType.KOBOLD.getPredicate()); } public KoboldDrillSergeant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KoboldOverlord.java b/Mage.Sets/src/mage/cards/k/KoboldOverlord.java index e08f64ea59..7053966479 100644 --- a/Mage.Sets/src/mage/cards/k/KoboldOverlord.java +++ b/Mage.Sets/src/mage/cards/k/KoboldOverlord.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class KoboldOverlord extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Kobold creatures"); static { - filter.add(new SubtypePredicate(SubType.KOBOLD)); + filter.add(SubType.KOBOLD.getPredicate()); } public KoboldOverlord(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KoboldTaskmaster.java b/Mage.Sets/src/mage/cards/k/KoboldTaskmaster.java index ee08d13069..0f63c4c778 100644 --- a/Mage.Sets/src/mage/cards/k/KoboldTaskmaster.java +++ b/Mage.Sets/src/mage/cards/k/KoboldTaskmaster.java @@ -9,7 +9,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -22,7 +21,7 @@ public final class KoboldTaskmaster extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.KOBOLD)); + filter.add(SubType.KOBOLD.getPredicate()); } public KoboldTaskmaster(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KodamaOfTheCenterTree.java b/Mage.Sets/src/mage/cards/k/KodamaOfTheCenterTree.java index 4eda44a9b0..9fda95772d 100644 --- a/Mage.Sets/src/mage/cards/k/KodamaOfTheCenterTree.java +++ b/Mage.Sets/src/mage/cards/k/KodamaOfTheCenterTree.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class KodamaOfTheCenterTree extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Spirits you control"); static { - filter.add(new SubtypePredicate(SubType.SPIRIT)); + filter.add(SubType.SPIRIT.getPredicate()); } public KodamaOfTheCenterTree(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KolaghanTheStormsFury.java b/Mage.Sets/src/mage/cards/k/KolaghanTheStormsFury.java index a33d11921f..f78f3d385b 100644 --- a/Mage.Sets/src/mage/cards/k/KolaghanTheStormsFury.java +++ b/Mage.Sets/src/mage/cards/k/KolaghanTheStormsFury.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import static mage.filter.StaticFilters.FILTER_PERMANENT_CREATURES; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -24,7 +23,7 @@ public final class KolaghanTheStormsFury extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Dragon you control"); static { - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/k/KondasHatamoto.java b/Mage.Sets/src/mage/cards/k/KondasHatamoto.java index d45438e477..bd5ce7e34c 100644 --- a/Mage.Sets/src/mage/cards/k/KondasHatamoto.java +++ b/Mage.Sets/src/mage/cards/k/KondasHatamoto.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; /** @@ -29,7 +28,7 @@ public final class KondasHatamoto extends CardImpl { static { filter.add(new SupertypePredicate(SuperType.LEGENDARY)); - filter.add(new SubtypePredicate(SubType.SAMURAI)); + filter.add(SubType.SAMURAI.getPredicate()); } public KondasHatamoto (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KopalaWardenOfWaves.java b/Mage.Sets/src/mage/cards/k/KopalaWardenOfWaves.java index 738f2ffc63..1683c59aee 100644 --- a/Mage.Sets/src/mage/cards/k/KopalaWardenOfWaves.java +++ b/Mage.Sets/src/mage/cards/k/KopalaWardenOfWaves.java @@ -19,7 +19,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.Target; @@ -63,7 +62,7 @@ class KopalaWardenOfWavesCostReductionEffect extends CostModificationEffectImpl private static final String effectText = "Spells your opponents cast that target a Merfolk you control cost {2} more to cast"; static { - filter.add(new SubtypePredicate(SubType.MERFOLK)); + filter.add(SubType.MERFOLK.getPredicate()); } KopalaWardenOfWavesCostReductionEffect() { @@ -117,7 +116,7 @@ class KopalaWardenOfWavesCostReductionEffect2 extends CostModificationEffectImpl private static final String effectText = "Abilities your opponents activate that target a Merfolk you control cost {2} more to activate"; static { - filter.add(new SubtypePredicate(SubType.MERFOLK)); + filter.add(SubType.MERFOLK.getPredicate()); } KopalaWardenOfWavesCostReductionEffect2() { diff --git a/Mage.Sets/src/mage/cards/k/KorCastigator.java b/Mage.Sets/src/mage/cards/k/KorCastigator.java index 2bcb00a615..fcaef8375d 100644 --- a/Mage.Sets/src/mage/cards/k/KorCastigator.java +++ b/Mage.Sets/src/mage/cards/k/KorCastigator.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,8 +21,8 @@ public final class KorCastigator extends CardImpl { private static final FilterCreaturePermanent FILTER = new FilterCreaturePermanent("Eldrazi Scions"); static { - FILTER.add(new SubtypePredicate(SubType.ELDRAZI)); - FILTER.add(new SubtypePredicate(SubType.SCION)); + FILTER.add(SubType.ELDRAZI.getPredicate()); + FILTER.add(SubType.SCION.getPredicate()); } public KorCastigator(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KorOutfitter.java b/Mage.Sets/src/mage/cards/k/KorOutfitter.java index 034c4de318..18b112647d 100644 --- a/Mage.Sets/src/mage/cards/k/KorOutfitter.java +++ b/Mage.Sets/src/mage/cards/k/KorOutfitter.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; @@ -27,7 +26,7 @@ public final class KorOutfitter extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Equipment you control"); static { - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); } public KorOutfitter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KorSpiritdancer.java b/Mage.Sets/src/mage/cards/k/KorSpiritdancer.java index 0c3e3a9cb9..8bcddcbd13 100644 --- a/Mage.Sets/src/mage/cards/k/KorSpiritdancer.java +++ b/Mage.Sets/src/mage/cards/k/KorSpiritdancer.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class KorSpiritdancer extends CardImpl { private static final FilterSpell filter = new FilterSpell("an Aura spell"); static { - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); } public KorSpiritdancer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KorlashHeirToBlackblade.java b/Mage.Sets/src/mage/cards/k/KorlashHeirToBlackblade.java index 6bbe31d34f..c23540a338 100644 --- a/Mage.Sets/src/mage/cards/k/KorlashHeirToBlackblade.java +++ b/Mage.Sets/src/mage/cards/k/KorlashHeirToBlackblade.java @@ -18,7 +18,6 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterLandCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -30,8 +29,8 @@ public final class KorlashHeirToBlackblade extends CardImpl { private static final FilterControlledPermanent filterPermanent = new FilterControlledPermanent("Swamps you control"); private static final FilterCard filterCard = new FilterLandCard("Swamp cards"); static { - filterPermanent.add(new SubtypePredicate(SubType.SWAMP)); - filterCard.add(new SubtypePredicate(SubType.SWAMP)); + filterPermanent.add(SubType.SWAMP.getPredicate()); + filterCard.add(SubType.SWAMP.getPredicate()); } public KorlashHeirToBlackblade(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KothOfTheHammer.java b/Mage.Sets/src/mage/cards/k/KothOfTheHammer.java index 557c50aaa5..39d65d9b78 100644 --- a/Mage.Sets/src/mage/cards/k/KothOfTheHammer.java +++ b/Mage.Sets/src/mage/cards/k/KothOfTheHammer.java @@ -20,7 +20,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.command.emblems.KothOfTheHammerEmblem; import mage.game.permanent.token.TokenImpl; @@ -36,7 +35,7 @@ public final class KothOfTheHammer extends CardImpl { static final FilterLandPermanent filterCount = new FilterLandPermanent("Mountain you control"); static { - filterCount.add(new SubtypePredicate(SubType.MOUNTAIN)); + filterCount.add(SubType.MOUNTAIN.getPredicate()); filterCount.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/k/KozileksReturn.java b/Mage.Sets/src/mage/cards/k/KozileksReturn.java index 2491a19441..dcf00353a3 100644 --- a/Mage.Sets/src/mage/cards/k/KozileksReturn.java +++ b/Mage.Sets/src/mage/cards/k/KozileksReturn.java @@ -16,7 +16,6 @@ import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -27,7 +26,7 @@ public final class KozileksReturn extends CardImpl { private static final FilterSpell filter = new FilterSpell("an Eldrazi creature spell with converted mana cost 7 or greater"); static { - filter.add(new SubtypePredicate(SubType.ELDRAZI)); + filter.add(SubType.ELDRAZI.getPredicate()); filter.add(CardType.CREATURE.getPredicate()); filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 6)); } diff --git a/Mage.Sets/src/mage/cards/k/KragmaWarcaller.java b/Mage.Sets/src/mage/cards/k/KragmaWarcaller.java index d87aa53b5b..a5281ffb4b 100644 --- a/Mage.Sets/src/mage/cards/k/KragmaWarcaller.java +++ b/Mage.Sets/src/mage/cards/k/KragmaWarcaller.java @@ -16,7 +16,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -27,7 +26,7 @@ public final class KragmaWarcaller extends CardImpl { private static final FilterControlledCreaturePermanent filter1 = new FilterControlledCreaturePermanent("Minotaur creatures you control"); private static final FilterControlledCreaturePermanent filter2 = new FilterControlledCreaturePermanent("Minotaur you control"); static { - filter1.add(new SubtypePredicate(SubType.MINOTAUR)); + filter1.add(SubType.MINOTAUR.getPredicate()); } public KragmaWarcaller(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KrakenOfTheStraits.java b/Mage.Sets/src/mage/cards/k/KrakenOfTheStraits.java index eaf75f6b6c..362e7274de 100644 --- a/Mage.Sets/src/mage/cards/k/KrakenOfTheStraits.java +++ b/Mage.Sets/src/mage/cards/k/KrakenOfTheStraits.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -50,7 +49,7 @@ class CantBeBlockedByCreaturesWithLessPowerEffect extends RestrictionEffect { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Islands"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } private final DynamicValue dynamicValue = new PermanentsOnBattlefieldCount(filter); diff --git a/Mage.Sets/src/mage/cards/k/KrosanGroundshaker.java b/Mage.Sets/src/mage/cards/k/KrosanGroundshaker.java index 0f5f12d46e..c7ff8aadc6 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanGroundshaker.java +++ b/Mage.Sets/src/mage/cards/k/KrosanGroundshaker.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -27,7 +26,7 @@ public final class KrosanGroundshaker extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Beast creature"); static { - filter.add(new SubtypePredicate(SubType.BEAST)); + filter.add(SubType.BEAST.getPredicate()); } public KrosanGroundshaker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KrosanVerge.java b/Mage.Sets/src/mage/cards/k/KrosanVerge.java index 511f556601..860c646ef1 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanVerge.java +++ b/Mage.Sets/src/mage/cards/k/KrosanVerge.java @@ -18,7 +18,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -31,8 +30,8 @@ public final class KrosanVerge extends CardImpl { private static final FilterCard filterPlains = new FilterCard("a Plains"); static { - filterForest.add(new SubtypePredicate(SubType.FOREST)); - filterPlains.add(new SubtypePredicate(SubType.PLAINS)); + filterForest.add(SubType.FOREST.getPredicate()); + filterPlains.add(SubType.PLAINS.getPredicate()); } public KrosanVerge(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KrosanWarchief.java b/Mage.Sets/src/mage/cards/k/KrosanWarchief.java index 09f327979e..e70f99f979 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanWarchief.java +++ b/Mage.Sets/src/mage/cards/k/KrosanWarchief.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; @@ -29,8 +28,8 @@ public final class KrosanWarchief extends CardImpl { private static final FilterCreaturePermanent filterTarget = new FilterCreaturePermanent("Beast"); static { - filter.add(new SubtypePredicate(SubType.BEAST)); - filterTarget.add(new SubtypePredicate(SubType.BEAST)); + filter.add(SubType.BEAST.getPredicate()); + filterTarget.add(SubType.BEAST.getPredicate()); } public KrosanWarchief(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KrovikanMist.java b/Mage.Sets/src/mage/cards/k/KrovikanMist.java index 1a3b4c8eb4..0086f145c2 100644 --- a/Mage.Sets/src/mage/cards/k/KrovikanMist.java +++ b/Mage.Sets/src/mage/cards/k/KrovikanMist.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -25,7 +24,7 @@ public final class KrovikanMist extends CardImpl { private static final FilterPermanent illusionsFilter = new FilterPermanent("Illusions on the battlefield"); static { - illusionsFilter.add(new SubtypePredicate(SubType.ILLUSION)); + illusionsFilter.add(SubType.ILLUSION.getPredicate()); } public KrovikanMist(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KrovikanPlague.java b/Mage.Sets/src/mage/cards/k/KrovikanPlague.java index 835ac9ee08..e5dd06a0cb 100644 --- a/Mage.Sets/src/mage/cards/k/KrovikanPlague.java +++ b/Mage.Sets/src/mage/cards/k/KrovikanPlague.java @@ -25,7 +25,6 @@ import mage.counters.BoostCounter; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; @@ -40,7 +39,7 @@ public final class KrovikanPlague extends CardImpl { private static final FilterControlledCreaturePermanent filterNonWall = new FilterControlledCreaturePermanent("non-Wall creature you control"); static { - filterNonWall.add(Predicates.not(new SubtypePredicate(SubType.WALL))); + filterNonWall.add(Predicates.not(SubType.WALL.getPredicate())); } private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("enchanted creature is untapped"); diff --git a/Mage.Sets/src/mage/cards/k/KukemssaSerpent.java b/Mage.Sets/src/mage/cards/k/KukemssaSerpent.java index b1a105933f..03ab575ac4 100644 --- a/Mage.Sets/src/mage/cards/k/KukemssaSerpent.java +++ b/Mage.Sets/src/mage/cards/k/KukemssaSerpent.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetLandPermanent; @@ -34,7 +33,7 @@ public final class KukemssaSerpent extends CardImpl { static { filterOpponentLand.add(new ControllerPredicate(TargetController.OPPONENT)); - filterControlledLand.add(new SubtypePredicate(SubType.ISLAND)); + filterControlledLand.add(SubType.ISLAND.getPredicate()); } public KukemssaSerpent(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java b/Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java index 620c839d28..c24d2afb1c 100644 --- a/Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java +++ b/Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java @@ -18,7 +18,6 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -35,13 +34,13 @@ public final class KumenaTyrantOfOrazca extends CardImpl { static { filterAnotherNotTapped.add(AnotherPredicate.instance); - filterAnotherNotTapped.add(new SubtypePredicate(SubType.MERFOLK)); + filterAnotherNotTapped.add(SubType.MERFOLK.getPredicate()); filterAnotherNotTapped.add(Predicates.not(TappedPredicate.instance)); - filterNotTapped.add(new SubtypePredicate(SubType.MERFOLK)); + filterNotTapped.add(SubType.MERFOLK.getPredicate()); filterNotTapped.add(Predicates.not(TappedPredicate.instance)); - filterAll.add(new SubtypePredicate(SubType.MERFOLK)); + filterAll.add(SubType.MERFOLK.getPredicate()); } public KumenaTyrantOfOrazca(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KyrenLegate.java b/Mage.Sets/src/mage/cards/k/KyrenLegate.java index 1c03329a93..4d48e06615 100644 --- a/Mage.Sets/src/mage/cards/k/KyrenLegate.java +++ b/Mage.Sets/src/mage/cards/k/KyrenLegate.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,8 +25,8 @@ public final class KyrenLegate extends CardImpl { private static final FilterPermanent filterMountain = new FilterPermanent(); static { - filterPlains.add(new SubtypePredicate(SubType.PLAINS)); - filterMountain.add(new SubtypePredicate(SubType.MOUNTAIN)); + filterPlains.add(SubType.PLAINS.getPredicate()); + filterMountain.add(SubType.MOUNTAIN.getPredicate()); } public KyrenLegate(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LakeOfTheDead.java b/Mage.Sets/src/mage/cards/l/LakeOfTheDead.java index c508936a3a..b38ec063bc 100644 --- a/Mage.Sets/src/mage/cards/l/LakeOfTheDead.java +++ b/Mage.Sets/src/mage/cards/l/LakeOfTheDead.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -28,7 +27,7 @@ public final class LakeOfTheDead extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Swamp"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public LakeOfTheDead(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LamplighterOfSelhoff.java b/Mage.Sets/src/mage/cards/l/LamplighterOfSelhoff.java index b3930a952c..2a0271bcd8 100644 --- a/Mage.Sets/src/mage/cards/l/LamplighterOfSelhoff.java +++ b/Mage.Sets/src/mage/cards/l/LamplighterOfSelhoff.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import java.util.UUID; @@ -27,7 +26,7 @@ public final class LamplighterOfSelhoff extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public LamplighterOfSelhoff(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LandGrant.java b/Mage.Sets/src/mage/cards/l/LandGrant.java index 11d56ada7b..f4a106566a 100644 --- a/Mage.Sets/src/mage/cards/l/LandGrant.java +++ b/Mage.Sets/src/mage/cards/l/LandGrant.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterLandCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; @@ -27,7 +26,7 @@ public final class LandGrant extends CardImpl { private static final FilterLandCard filter = new FilterLandCard("Forest card"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public LandGrant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LandbindRitual.java b/Mage.Sets/src/mage/cards/l/LandbindRitual.java index 7eb44efbe5..afff0593fd 100644 --- a/Mage.Sets/src/mage/cards/l/LandbindRitual.java +++ b/Mage.Sets/src/mage/cards/l/LandbindRitual.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -22,7 +21,7 @@ public final class LandbindRitual extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Plains you control"); static { - filter.add(new SubtypePredicate(SubType.PLAINS)); + filter.add(SubType.PLAINS.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/l/LandoCalrissian.java b/Mage.Sets/src/mage/cards/l/LandoCalrissian.java index c37b5885e4..65e5522266 100644 --- a/Mage.Sets/src/mage/cards/l/LandoCalrissian.java +++ b/Mage.Sets/src/mage/cards/l/LandoCalrissian.java @@ -13,7 +13,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -26,7 +25,7 @@ public final class LandoCalrissian extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Starship you control"); static { - filter.add(new SubtypePredicate(SubType.STARSHIP)); + filter.add(SubType.STARSHIP.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/l/Landslide.java b/Mage.Sets/src/mage/cards/l/Landslide.java index ffbab866bb..fa0bea4bc9 100644 --- a/Mage.Sets/src/mage/cards/l/Landslide.java +++ b/Mage.Sets/src/mage/cards/l/Landslide.java @@ -11,7 +11,6 @@ import mage.constants.SubType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -50,7 +49,7 @@ class LandslideEffect extends OneShotEffect { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public LandslideEffect() { diff --git a/Mage.Sets/src/mage/cards/l/LanternScout.java b/Mage.Sets/src/mage/cards/l/LanternScout.java index 4f52c49957..61329b9333 100644 --- a/Mage.Sets/src/mage/cards/l/LanternScout.java +++ b/Mage.Sets/src/mage/cards/l/LanternScout.java @@ -17,7 +17,6 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardIdPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -36,7 +35,7 @@ public final class LanternScout extends CardImpl { FilterPermanent filter = new FilterPermanent("{this} or another Ally"); filter.add(Predicates.or( new CardIdPredicate(this.getId()), - new SubtypePredicate(SubType.ALLY))); + SubType.ALLY.getPredicate())); // Rally — Whenever Lantern Scout or another Ally enters the battlefield under your control, creatures you control gain lifelink until end of turn. Effect effect = new GainAbilityAllEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/l/Lashknife.java b/Mage.Sets/src/mage/cards/l/Lashknife.java index a99bf8d117..03f8334103 100644 --- a/Mage.Sets/src/mage/cards/l/Lashknife.java +++ b/Mage.Sets/src/mage/cards/l/Lashknife.java @@ -23,7 +23,6 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -37,7 +36,7 @@ public final class Lashknife extends CardImpl { private static final FilterControlledCreaturePermanent creatureFilter = new FilterControlledCreaturePermanent("an untapped creature you control"); static { - plainsFilter.add(new SubtypePredicate(SubType.PLAINS)); + plainsFilter.add(SubType.PLAINS.getPredicate()); creatureFilter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/l/Lashwrithe.java b/Mage.Sets/src/mage/cards/l/Lashwrithe.java index 870c6e9169..c6e10e8299 100644 --- a/Mage.Sets/src/mage/cards/l/Lashwrithe.java +++ b/Mage.Sets/src/mage/cards/l/Lashwrithe.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -24,7 +23,7 @@ public final class Lashwrithe extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Swamp you control"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/l/LastStand.java b/Mage.Sets/src/mage/cards/l/LastStand.java index 4e8919d3e6..aca592d659 100644 --- a/Mage.Sets/src/mage/cards/l/LastStand.java +++ b/Mage.Sets/src/mage/cards/l/LastStand.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.SaprolingToken; @@ -52,11 +51,11 @@ class LastStandEffect extends OneShotEffect { private static final FilterControlledLandPermanent filterForest = new FilterControlledLandPermanent(); private static final FilterControlledLandPermanent filterIsland = new FilterControlledLandPermanent(); static { - filterSwamp.add(new SubtypePredicate(SubType.SWAMP)); - filterMountain.add(new SubtypePredicate(SubType.MOUNTAIN)); - filterPlains.add(new SubtypePredicate(SubType.PLAINS)); - filterForest.add(new SubtypePredicate(SubType.FOREST)); - filterIsland.add(new SubtypePredicate(SubType.ISLAND)); + filterSwamp.add(SubType.SWAMP.getPredicate()); + filterMountain.add(SubType.MOUNTAIN.getPredicate()); + filterPlains.add(SubType.PLAINS.getPredicate()); + filterForest.add(SubType.FOREST.getPredicate()); + filterIsland.add(SubType.ISLAND.getPredicate()); } public LastStandEffect() { diff --git a/Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java b/Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java index e93fb4b01d..be1e30121e 100644 --- a/Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java +++ b/Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java @@ -18,7 +18,6 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.DragonToken2; @@ -33,10 +32,10 @@ public final class LathlissDragonQueen extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("Dragons"); static { - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); filter.add(Predicates.not(TokenPredicate.instance)); filter.add(AnotherPredicate.instance); - filter2.add(new SubtypePredicate(SubType.DRAGON)); + filter2.add(SubType.DRAGON.getPredicate()); } public LathlissDragonQueen(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LavaDart.java b/Mage.Sets/src/mage/cards/l/LavaDart.java index f88693ef00..401edd25bd 100644 --- a/Mage.Sets/src/mage/cards/l/LavaDart.java +++ b/Mage.Sets/src/mage/cards/l/LavaDart.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TimingRule; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetAnyTarget; @@ -24,7 +23,7 @@ public final class LavaDart extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Mountain"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public LavaDart(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LeadBellyChimera.java b/Mage.Sets/src/mage/cards/l/LeadBellyChimera.java index 5e820c5b96..e6bb5fde5c 100644 --- a/Mage.Sets/src/mage/cards/l/LeadBellyChimera.java +++ b/Mage.Sets/src/mage/cards/l/LeadBellyChimera.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -30,7 +29,7 @@ public final class LeadBellyChimera extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Chimera creature"); static { - filter.add(new SubtypePredicate(SubType.CHIMERA)); + filter.add(SubType.CHIMERA.getPredicate()); } public LeadBellyChimera(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LeechingSliver.java b/Mage.Sets/src/mage/cards/l/LeechingSliver.java index 44f977145d..723820f4ce 100644 --- a/Mage.Sets/src/mage/cards/l/LeechingSliver.java +++ b/Mage.Sets/src/mage/cards/l/LeechingSliver.java @@ -12,7 +12,6 @@ import mage.constants.SetTargetPointer; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -24,7 +23,7 @@ public final class LeechingSliver extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); } public LeechingSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LegionLieutenant.java b/Mage.Sets/src/mage/cards/l/LegionLieutenant.java index 29f2d433ce..5be400a6ad 100644 --- a/Mage.Sets/src/mage/cards/l/LegionLieutenant.java +++ b/Mage.Sets/src/mage/cards/l/LegionLieutenant.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -25,7 +24,7 @@ public final class LegionLieutenant extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Vampires you control"); static { - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/l/LegionsOfLimDul.java b/Mage.Sets/src/mage/cards/l/LegionsOfLimDul.java index 2c550e8a4a..aa7d7fd87e 100644 --- a/Mage.Sets/src/mage/cards/l/LegionsOfLimDul.java +++ b/Mage.Sets/src/mage/cards/l/LegionsOfLimDul.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; /** @@ -23,7 +22,7 @@ public final class LegionsOfLimDul extends CardImpl { static { filter.add(new SupertypePredicate(SuperType.SNOW)); - filter.add(new SubtypePredicate(SubType.SWAMP )); + filter.add(SubType.SWAMP .getPredicate()); } public LegionsOfLimDul(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/Leviathan.java b/Mage.Sets/src/mage/cards/l/Leviathan.java index e963de31dc..7dbbf135f4 100644 --- a/Mage.Sets/src/mage/cards/l/Leviathan.java +++ b/Mage.Sets/src/mage/cards/l/Leviathan.java @@ -12,7 +12,6 @@ import mage.abilities.effects.PayCostToAttackBlockEffectImpl; import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.DontUntapInControllersUntapStepSourceEffect; import mage.abilities.effects.common.UntapSourceEffect; -import mage.abilities.effects.common.combat.CantAttackUnlessPaysAttachedEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -23,7 +22,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.common.TargetControlledPermanent; @@ -39,7 +37,7 @@ public final class Leviathan extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("two Islands"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } public Leviathan(UUID ownerId, CardSetInfo setInfo) { @@ -86,7 +84,7 @@ class LeviathanCostToAttackBlockEffect extends PayCostToAttackBlockEffectImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("two Islands"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } LeviathanCostToAttackBlockEffect() { diff --git a/Mage.Sets/src/mage/cards/l/LichLordOfUnx.java b/Mage.Sets/src/mage/cards/l/LichLordOfUnx.java index 3e1ed97f34..1f3b0dc65b 100644 --- a/Mage.Sets/src/mage/cards/l/LichLordOfUnx.java +++ b/Mage.Sets/src/mage/cards/l/LichLordOfUnx.java @@ -17,7 +17,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.ZombieWizardToken; import mage.target.TargetPlayer; @@ -30,7 +29,7 @@ public final class LichLordOfUnx extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Zombies you control"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public LichLordOfUnx(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LifeAndLimb.java b/Mage.Sets/src/mage/cards/l/LifeAndLimb.java index 754454e18d..46ce123a1e 100644 --- a/Mage.Sets/src/mage/cards/l/LifeAndLimb.java +++ b/Mage.Sets/src/mage/cards/l/LifeAndLimb.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -45,7 +44,7 @@ class LifeAndLimbEffect extends ContinuousEffectImpl { private static final FilterPermanent filter = new FilterPermanent("All Forests and all Saprolings"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.FOREST), new SubtypePredicate(SubType.SAPROLING))); + filter.add(Predicates.or(SubType.FOREST.getPredicate(), SubType.SAPROLING.getPredicate())); } LifeAndLimbEffect() { diff --git a/Mage.Sets/src/mage/cards/l/Lifeblood.java b/Mage.Sets/src/mage/cards/l/Lifeblood.java index 3b79bc8931..adde86a0da 100644 --- a/Mage.Sets/src/mage/cards/l/Lifeblood.java +++ b/Mage.Sets/src/mage/cards/l/Lifeblood.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -22,7 +21,7 @@ public final class Lifeblood extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("a Mountain an opponent controls"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); filter.add(new ControllerPredicate(TargetController.OPPONENT)); } diff --git a/Mage.Sets/src/mage/cards/l/Lifespinner.java b/Mage.Sets/src/mage/cards/l/Lifespinner.java index 04a02ede47..80b2eb9f58 100644 --- a/Mage.Sets/src/mage/cards/l/Lifespinner.java +++ b/Mage.Sets/src/mage/cards/l/Lifespinner.java @@ -15,7 +15,6 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledPermanent; @@ -30,7 +29,7 @@ public final class Lifespinner extends CardImpl { static { filter.add(new SupertypePredicate(SuperType.LEGENDARY)); - filter.add(new SubtypePredicate(SubType.SPIRIT)); + filter.add(SubType.SPIRIT.getPredicate()); } public Lifespinner(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/Lifetap.java b/Mage.Sets/src/mage/cards/l/Lifetap.java index d3936b1542..e37a8b4b17 100644 --- a/Mage.Sets/src/mage/cards/l/Lifetap.java +++ b/Mage.Sets/src/mage/cards/l/Lifetap.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -22,7 +21,7 @@ public final class Lifetap extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("a Forest an opponent controls"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); filter.add(new ControllerPredicate(TargetController.OPPONENT)); } diff --git a/Mage.Sets/src/mage/cards/l/LightningRigCrew.java b/Mage.Sets/src/mage/cards/l/LightningRigCrew.java index ad014efffd..02179f46b5 100644 --- a/Mage.Sets/src/mage/cards/l/LightningRigCrew.java +++ b/Mage.Sets/src/mage/cards/l/LightningRigCrew.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -27,7 +26,7 @@ public final class LightningRigCrew extends CardImpl { private static final FilterSpell filter = new FilterSpell("a Pirate spell"); static { - filter.add(new SubtypePredicate(SubType.PIRATE)); + filter.add(SubType.PIRATE.getPredicate()); } public LightningRigCrew(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LilianaDeathsMajesty.java b/Mage.Sets/src/mage/cards/l/LilianaDeathsMajesty.java index 15b9dd6eb4..7ec38c09ca 100644 --- a/Mage.Sets/src/mage/cards/l/LilianaDeathsMajesty.java +++ b/Mage.Sets/src/mage/cards/l/LilianaDeathsMajesty.java @@ -17,7 +17,6 @@ import mage.constants.SuperType; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.ZombieToken; import mage.target.common.TargetCardInYourGraveyard; @@ -30,7 +29,7 @@ public final class LilianaDeathsMajesty extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Zombie creatures"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.ZOMBIE))); + filter.add(Predicates.not(SubType.ZOMBIE.getPredicate())); } public LilianaDeathsMajesty(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LilianaOfTheDarkRealms.java b/Mage.Sets/src/mage/cards/l/LilianaOfTheDarkRealms.java index 5f8d2b5eed..1f64cbb17e 100644 --- a/Mage.Sets/src/mage/cards/l/LilianaOfTheDarkRealms.java +++ b/Mage.Sets/src/mage/cards/l/LilianaOfTheDarkRealms.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandCard; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.command.emblems.LilianaOfTheDarkRealmsEmblem; @@ -31,7 +30,7 @@ public final class LilianaOfTheDarkRealms extends CardImpl { private static final FilterLandCard filter = new FilterLandCard("Swamp card"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public LilianaOfTheDarkRealms(UUID ownerId, CardSetInfo setInfo) { @@ -86,7 +85,7 @@ class LilianaOfTheDarkRealmsEffect extends ContinuousEffectImpl { super.init(source, game); FilterLandPermanent filter = new FilterLandPermanent("Swamps"); - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); this.amount = game.getBattlefield().count(filter, source.getSourceId(), source.getControllerId(), game); diff --git a/Mage.Sets/src/mage/cards/l/LilianasMastery.java b/Mage.Sets/src/mage/cards/l/LilianasMastery.java index de50bf747a..c0eeb6c138 100644 --- a/Mage.Sets/src/mage/cards/l/LilianasMastery.java +++ b/Mage.Sets/src/mage/cards/l/LilianasMastery.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.ZombieToken; /** @@ -25,7 +24,7 @@ public final class LilianasMastery extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Zombie creatures"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public LilianasMastery(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LilianasShade.java b/Mage.Sets/src/mage/cards/l/LilianasShade.java index 8091f73f31..c42a356973 100644 --- a/Mage.Sets/src/mage/cards/l/LilianasShade.java +++ b/Mage.Sets/src/mage/cards/l/LilianasShade.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -27,7 +26,7 @@ public final class LilianasShade extends CardImpl { private static final FilterLandCard filter = new FilterLandCard("Swamp"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public LilianasShade(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LimDulTheNecromancer.java b/Mage.Sets/src/mage/cards/l/LimDulTheNecromancer.java index f659ba315d..7f75d49f9e 100644 --- a/Mage.Sets/src/mage/cards/l/LimDulTheNecromancer.java +++ b/Mage.Sets/src/mage/cards/l/LimDulTheNecromancer.java @@ -18,7 +18,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -37,7 +36,7 @@ public final class LimDulTheNecromancer extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); - filter2.add(new SubtypePredicate(SubType.ZOMBIE)); + filter2.add(SubType.ZOMBIE.getPredicate()); } public LimDulTheNecromancer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java b/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java index c9ec6edc26..5a907accc7 100644 --- a/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java +++ b/Mage.Sets/src/mage/cards/l/LinSivviDefiantHero.java @@ -17,7 +17,6 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.other.OwnerPredicate; import mage.game.Game; import mage.players.Player; @@ -34,7 +33,7 @@ public final class LinSivviDefiantHero extends CardImpl { static { filter.add(new OwnerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.REBEL)); + filter.add(SubType.REBEL.getPredicate()); } static final String rule = "Put target Rebel card from your graveyard on the bottom of your library"; @@ -97,7 +96,7 @@ class LinSivviDefiantHeroEffect extends OneShotEffect { FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with converted mana cost " + xCost + " or less"); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, xCost + 1)); - filter.add(new SubtypePredicate(SubType.REBEL)); + filter.add(SubType.REBEL.getPredicate()); TargetCardInLibrary target = new TargetCardInLibrary(filter); if (controller.searchLibrary(target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/l/Lithophage.java b/Mage.Sets/src/mage/cards/l/Lithophage.java index 0350fcb77a..c207dbbca9 100644 --- a/Mage.Sets/src/mage/cards/l/Lithophage.java +++ b/Mage.Sets/src/mage/cards/l/Lithophage.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -25,7 +24,7 @@ public final class Lithophage extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("a Mountain"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public Lithophage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LivingLands.java b/Mage.Sets/src/mage/cards/l/LivingLands.java index fc108e9994..78908564bb 100644 --- a/Mage.Sets/src/mage/cards/l/LivingLands.java +++ b/Mage.Sets/src/mage/cards/l/LivingLands.java @@ -1,7 +1,6 @@ package mage.cards.l; -import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.BecomesCreatureAllEffect; @@ -9,9 +8,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.game.permanent.token.TokenImpl; -import mage.game.permanent.token.Token; import mage.game.permanent.token.custom.CreatureToken; import java.util.UUID; @@ -25,7 +21,7 @@ public final class LivingLands extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Forests"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public LivingLands(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LlanowarDruid.java b/Mage.Sets/src/mage/cards/l/LlanowarDruid.java index 5038639976..302e9889a8 100644 --- a/Mage.Sets/src/mage/cards/l/LlanowarDruid.java +++ b/Mage.Sets/src/mage/cards/l/LlanowarDruid.java @@ -15,7 +15,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -57,7 +56,7 @@ class LlanowarDruidEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterPermanent(); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public LlanowarDruidEffect() { diff --git a/Mage.Sets/src/mage/cards/l/LoamLion.java b/Mage.Sets/src/mage/cards/l/LoamLion.java index d95792517d..6acb35840f 100644 --- a/Mage.Sets/src/mage/cards/l/LoamLion.java +++ b/Mage.Sets/src/mage/cards/l/LoamLion.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class LoamLion extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("a Forest"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public LoamLion(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LongForgottenGohei.java b/Mage.Sets/src/mage/cards/l/LongForgottenGohei.java index 151a4fa361..c5438d8ddc 100644 --- a/Mage.Sets/src/mage/cards/l/LongForgottenGohei.java +++ b/Mage.Sets/src/mage/cards/l/LongForgottenGohei.java @@ -41,7 +41,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -54,8 +53,8 @@ public final class LongForgottenGohei extends CardImpl { private static final FilterCreaturePermanent spiritFilter = new FilterCreaturePermanent("Spirit creatures"); static { - arcaneFilter.add(new SubtypePredicate(SubType.ARCANE)); - spiritFilter.add(new SubtypePredicate(SubType.SPIRIT)); + arcaneFilter.add(SubType.ARCANE.getPredicate()); + spiritFilter.add(SubType.SPIRIT.getPredicate()); } public LongForgottenGohei(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LookoutsDispersal.java b/Mage.Sets/src/mage/cards/l/LookoutsDispersal.java index 6a8c3a870b..ca432b80c0 100644 --- a/Mage.Sets/src/mage/cards/l/LookoutsDispersal.java +++ b/Mage.Sets/src/mage/cards/l/LookoutsDispersal.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetSpell; /** @@ -26,7 +25,7 @@ public final class LookoutsDispersal extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Pirate"); static { - filter.add(new SubtypePredicate(SubType.PIRATE)); + filter.add(SubType.PIRATE.getPredicate()); } public LookoutsDispersal(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LordOfLineage.java b/Mage.Sets/src/mage/cards/l/LordOfLineage.java index 1525296550..45c3c825a7 100644 --- a/Mage.Sets/src/mage/cards/l/LordOfLineage.java +++ b/Mage.Sets/src/mage/cards/l/LordOfLineage.java @@ -16,7 +16,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.VampireToken; /** @@ -28,7 +27,7 @@ public final class LordOfLineage extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Other Vampire creatures"); static { - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); } public LordOfLineage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LordOfTheUndead.java b/Mage.Sets/src/mage/cards/l/LordOfTheUndead.java index 4387d6671d..8f757a1eb0 100644 --- a/Mage.Sets/src/mage/cards/l/LordOfTheUndead.java +++ b/Mage.Sets/src/mage/cards/l/LordOfTheUndead.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInYourGraveyard; /** @@ -30,8 +29,8 @@ public final class LordOfTheUndead extends CardImpl { private static final FilterCard filterCard = new FilterCard("Zombie card from your graveyard"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); - filterCard.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); + filterCard.add(SubType.ZOMBIE.getPredicate()); } public LordOfTheUndead(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LordOfTheUnreal.java b/Mage.Sets/src/mage/cards/l/LordOfTheUnreal.java index dd4eef7fd9..17089ee571 100644 --- a/Mage.Sets/src/mage/cards/l/LordOfTheUnreal.java +++ b/Mage.Sets/src/mage/cards/l/LordOfTheUnreal.java @@ -16,7 +16,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @author Loki @@ -26,7 +25,7 @@ public final class LordOfTheUnreal extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Illusion creatures"); static { - filter.add(new SubtypePredicate(SubType.ILLUSION)); + filter.add(SubType.ILLUSION.getPredicate()); } public LordOfTheUnreal(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LovisaColdeyes.java b/Mage.Sets/src/mage/cards/l/LovisaColdeyes.java index 6863feb7e3..3b425545a0 100644 --- a/Mage.Sets/src/mage/cards/l/LovisaColdeyes.java +++ b/Mage.Sets/src/mage/cards/l/LovisaColdeyes.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -25,7 +24,7 @@ public final class LovisaColdeyes extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature that's a Barbarian, a Warrior, or a Berserker"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.BARBARIAN), new SubtypePredicate(SubType.WARRIOR), new SubtypePredicate(SubType.BERSERKER))); + filter.add(Predicates.or(SubType.BARBARIAN.getPredicate(), SubType.WARRIOR.getPredicate(), SubType.BERSERKER.getPredicate())); } public LovisaColdeyes(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LowlandOaf.java b/Mage.Sets/src/mage/cards/l/LowlandOaf.java index 5d4c5a655a..4a310f7189 100644 --- a/Mage.Sets/src/mage/cards/l/LowlandOaf.java +++ b/Mage.Sets/src/mage/cards/l/LowlandOaf.java @@ -18,7 +18,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -34,7 +33,7 @@ public final class LowlandOaf extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Goblin creature you control"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/l/LuckyClover.java b/Mage.Sets/src/mage/cards/l/LuckyClover.java index 08ef868750..4f7d10ad24 100644 --- a/Mage.Sets/src/mage/cards/l/LuckyClover.java +++ b/Mage.Sets/src/mage/cards/l/LuckyClover.java @@ -8,7 +8,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterSpell; import mage.filter.common.FilterInstantOrSorcerySpell; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -21,7 +20,7 @@ public final class LuckyClover extends CardImpl { = new FilterInstantOrSorcerySpell("an Adventure instant or sorcery spell"); static { - filter.add(new SubtypePredicate(SubType.ADVENTURE)); + filter.add(SubType.ADVENTURE.getPredicate()); } public LuckyClover(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LullmageMentor.java b/Mage.Sets/src/mage/cards/l/LullmageMentor.java index 7262f0752c..6b6219b953 100644 --- a/Mage.Sets/src/mage/cards/l/LullmageMentor.java +++ b/Mage.Sets/src/mage/cards/l/LullmageMentor.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.permanent.token.MerfolkToken; import mage.target.TargetSpell; @@ -31,7 +30,7 @@ public final class LullmageMentor extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Merfolk you control"); static { - filter.add(new SubtypePredicate(SubType.MERFOLK)); + filter.add(SubType.MERFOLK.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/l/LuminescentRain.java b/Mage.Sets/src/mage/cards/l/LuminescentRain.java index 5855b0ca76..89ed27a60a 100644 --- a/Mage.Sets/src/mage/cards/l/LuminescentRain.java +++ b/Mage.Sets/src/mage/cards/l/LuminescentRain.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; @@ -63,7 +62,7 @@ class LuminescentRainEffect extends OneShotEffect { Choice typeChoice = new ChoiceCreatureType(game.getObject(source.getSourceId())); if (player != null && player.choose(Outcome.BoostCreature, typeChoice, game)) { FilterControlledPermanent filter = new FilterControlledPermanent(); - filter.add(new SubtypePredicate(SubType.byDescription(typeChoice.getChoice()))); + filter.add(SubType.byDescription(typeChoice.getChoice()).getPredicate()); return new GainLifeEffect(new PermanentsOnBattlefieldCount(filter, 2)).apply(game, source); } return false; diff --git a/Mage.Sets/src/mage/cards/l/LysAlanaBowmaster.java b/Mage.Sets/src/mage/cards/l/LysAlanaBowmaster.java index 63f1c04305..8bc9acdeff 100644 --- a/Mage.Sets/src/mage/cards/l/LysAlanaBowmaster.java +++ b/Mage.Sets/src/mage/cards/l/LysAlanaBowmaster.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.filter.FilterSpell; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -28,7 +27,7 @@ public final class LysAlanaBowmaster extends CardImpl { private static final FilterCreaturePermanent filterFlying = new FilterCreaturePermanent("creature with flying"); static { - filterElf.add(new SubtypePredicate(SubType.ELF)); + filterElf.add(SubType.ELF.getPredicate()); filterFlying.add(new AbilityPredicate(FlyingAbility.class)); } diff --git a/Mage.Sets/src/mage/cards/l/LysAlanaHuntmaster.java b/Mage.Sets/src/mage/cards/l/LysAlanaHuntmaster.java index 389334cefb..d706ee6fa3 100644 --- a/Mage.Sets/src/mage/cards/l/LysAlanaHuntmaster.java +++ b/Mage.Sets/src/mage/cards/l/LysAlanaHuntmaster.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.ElfToken; /** @@ -22,7 +21,7 @@ public final class LysAlanaHuntmaster extends CardImpl { private static final FilterSpell filter = new FilterSpell("Elf spell"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public LysAlanaHuntmaster(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LysAlanaScarblade.java b/Mage.Sets/src/mage/cards/l/LysAlanaScarblade.java index 4b7198966b..80e4ea18c5 100644 --- a/Mage.Sets/src/mage/cards/l/LysAlanaScarblade.java +++ b/Mage.Sets/src/mage/cards/l/LysAlanaScarblade.java @@ -19,7 +19,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -32,8 +31,8 @@ public final class LysAlanaScarblade extends CardImpl { private static final FilterCard filter2 = new FilterCard("an Elf card"); static { - filter1.add(new SubtypePredicate(SubType.ELF)); - filter2.add(new SubtypePredicate(SubType.ELF)); + filter1.add(SubType.ELF.getPredicate()); + filter2.add(SubType.ELF.getPredicate()); } public LysAlanaScarblade(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MadAuntie.java b/Mage.Sets/src/mage/cards/m/MadAuntie.java index 8e3f29ce38..2d2ea0f0a6 100644 --- a/Mage.Sets/src/mage/cards/m/MadAuntie.java +++ b/Mage.Sets/src/mage/cards/m/MadAuntie.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; @@ -30,7 +29,7 @@ public final class MadAuntie extends CardImpl { private static final FilterCreaturePermanent filter1 = new FilterCreaturePermanent("another target Goblin"); static { - filter1.add(new SubtypePredicate(SubType.GOBLIN)); + filter1.add(SubType.GOBLIN.getPredicate()); filter1.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/m/MaddeningImp.java b/Mage.Sets/src/mage/cards/m/MaddeningImp.java index e76411ba6a..198b006fb9 100644 --- a/Mage.Sets/src/mage/cards/m/MaddeningImp.java +++ b/Mage.Sets/src/mage/cards/m/MaddeningImp.java @@ -21,7 +21,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -37,7 +36,7 @@ public final class MaddeningImp extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Wall creatures"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.WALL))); + filter.add(Predicates.not(SubType.WALL.getPredicate())); filter.add(new ControllerPredicate(TargetController.ACTIVE)); filter.setMessage("non-Wall creatures the active player controls"); } @@ -91,7 +90,7 @@ class MaddeningImpCreateDelayedTriggeredAbilityEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.WALL))); + filter.add(Predicates.not(SubType.WALL.getPredicate())); filter.add(new ControllerPredicate(TargetController.ACTIVE)); } diff --git a/Mage.Sets/src/mage/cards/m/MagneticTheft.java b/Mage.Sets/src/mage/cards/m/MagneticTheft.java index 91f9a9439e..8cd7699b2f 100644 --- a/Mage.Sets/src/mage/cards/m/MagneticTheft.java +++ b/Mage.Sets/src/mage/cards/m/MagneticTheft.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -25,7 +24,7 @@ public final class MagneticTheft extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Equipment"); static { - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); } public MagneticTheft(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheCoffers.java b/Mage.Sets/src/mage/cards/m/MagusOfTheCoffers.java index 777dae0a39..8707c32566 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheCoffers.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheCoffers.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -25,7 +24,7 @@ public final class MagusOfTheCoffers extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Swamp you control"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public MagusOfTheCoffers(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MaintenanceHangar.java b/Mage.Sets/src/mage/cards/m/MaintenanceHangar.java index 15835415f8..6ee72aaad5 100644 --- a/Mage.Sets/src/mage/cards/m/MaintenanceHangar.java +++ b/Mage.Sets/src/mage/cards/m/MaintenanceHangar.java @@ -17,7 +17,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; @@ -30,7 +29,7 @@ public final class MaintenanceHangar extends CardImpl { private static final FilterCreaturePermanent filterPermanent = new FilterCreaturePermanent("Starship creatures"); static { - filterPermanent.add(new SubtypePredicate(SubType.STARSHIP)); + filterPermanent.add(SubType.STARSHIP.getPredicate()); } public MaintenanceHangar(UUID ownerId, CardSetInfo setInfo) { @@ -93,7 +92,7 @@ class MaintenanceHangarEffect extends ContinuousEffectImpl { private static final FilterCreatureCard filterCard = new FilterCreatureCard("Starship creatures"); static { - filterCard.add(new SubtypePredicate(SubType.STARSHIP)); + filterCard.add(SubType.STARSHIP.getPredicate()); } public MaintenanceHangarEffect() { diff --git a/Mage.Sets/src/mage/cards/m/MajesticHeliopterus.java b/Mage.Sets/src/mage/cards/m/MajesticHeliopterus.java index a302dcb0e5..dff3008374 100644 --- a/Mage.Sets/src/mage/cards/m/MajesticHeliopterus.java +++ b/Mage.Sets/src/mage/cards/m/MajesticHeliopterus.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; @@ -28,7 +27,7 @@ public final class MajesticHeliopterus extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another target Dinosaur you control"); static { filter.add(AnotherPredicate.instance); - filter.add(new SubtypePredicate(SubType.DINOSAUR)); + filter.add(SubType.DINOSAUR.getPredicate()); } public MajesticHeliopterus(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); diff --git a/Mage.Sets/src/mage/cards/m/MalakirBloodwitch.java b/Mage.Sets/src/mage/cards/m/MalakirBloodwitch.java index de99947581..e4c4715d7d 100644 --- a/Mage.Sets/src/mage/cards/m/MalakirBloodwitch.java +++ b/Mage.Sets/src/mage/cards/m/MalakirBloodwitch.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; @@ -73,7 +72,7 @@ class MalakirBloodwitchEffect extends OneShotEffect { } FilterControlledPermanent filter = new FilterControlledPermanent("Vampire"); - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); int amount = game.getBattlefield().countAll(filter, source.getControllerId(), game); Set opponents = game.getOpponents(source.getControllerId()); diff --git a/Mage.Sets/src/mage/cards/m/MalakirSoothsayer.java b/Mage.Sets/src/mage/cards/m/MalakirSoothsayer.java index e55d840ec1..131317d347 100644 --- a/Mage.Sets/src/mage/cards/m/MalakirSoothsayer.java +++ b/Mage.Sets/src/mage/cards/m/MalakirSoothsayer.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -30,7 +29,7 @@ public final class MalakirSoothsayer extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Ally you control"); static { - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/m/ManrikiGusari.java b/Mage.Sets/src/mage/cards/m/ManrikiGusari.java index 622e635581..4599facdad 100644 --- a/Mage.Sets/src/mage/cards/m/ManrikiGusari.java +++ b/Mage.Sets/src/mage/cards/m/ManrikiGusari.java @@ -15,7 +15,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -27,7 +26,7 @@ public final class ManrikiGusari extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Equipment"); static { - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); } public ManrikiGusari(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MaraudingBoneslasher.java b/Mage.Sets/src/mage/cards/m/MaraudingBoneslasher.java index 63ce40b3c2..781c0c702a 100644 --- a/Mage.Sets/src/mage/cards/m/MaraudingBoneslasher.java +++ b/Mage.Sets/src/mage/cards/m/MaraudingBoneslasher.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -23,7 +22,7 @@ public final class MaraudingBoneslasher extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("another Zombie"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/m/MaraudingKnight.java b/Mage.Sets/src/mage/cards/m/MaraudingKnight.java index c8025547da..c97407beb2 100644 --- a/Mage.Sets/src/mage/cards/m/MaraudingKnight.java +++ b/Mage.Sets/src/mage/cards/m/MaraudingKnight.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -23,7 +22,7 @@ public final class MaraudingKnight extends CardImpl { private static final FilterLandPermanent plainsFilter = new FilterLandPermanent("Plains your opponent controls"); static { - plainsFilter.add(new SubtypePredicate(SubType.PLAINS)); + plainsFilter.add(SubType.PLAINS.getPredicate()); plainsFilter.add(new ControllerPredicate(TargetController.OPPONENT)); } diff --git a/Mage.Sets/src/mage/cards/m/MarchFromTheTomb.java b/Mage.Sets/src/mage/cards/m/MarchFromTheTomb.java index eafdeeffc3..a8756647f8 100644 --- a/Mage.Sets/src/mage/cards/m/MarchFromTheTomb.java +++ b/Mage.Sets/src/mage/cards/m/MarchFromTheTomb.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.target.common.TargetCardInYourGraveyard; @@ -32,7 +31,7 @@ public final class MarchFromTheTomb extends CardImpl { effect.setText("Return any number of target Ally creature cards with total converted mana cost of 8 or less from your graveyard to the battlefield"); this.getSpellAbility().addEffect(effect); FilterCard filter = new FilterCreatureCard(); - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); this.getSpellAbility().addTarget(new MarchFromTheTombTarget(0, Integer.MAX_VALUE, filter)); } diff --git a/Mage.Sets/src/mage/cards/m/MarchOfTheDrowned.java b/Mage.Sets/src/mage/cards/m/MarchOfTheDrowned.java index 0ddede3205..0c70136268 100644 --- a/Mage.Sets/src/mage/cards/m/MarchOfTheDrowned.java +++ b/Mage.Sets/src/mage/cards/m/MarchOfTheDrowned.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.StaticFilters; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInYourGraveyard; /** @@ -22,7 +21,7 @@ public final class MarchOfTheDrowned extends CardImpl { private static final FilterCard filter = new FilterCard("Pirate cards from your graveyard"); static { - filter.add(new SubtypePredicate(SubType.PIRATE)); + filter.add(SubType.PIRATE.getPredicate()); } public MarchOfTheDrowned(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MarkovCrusader.java b/Mage.Sets/src/mage/cards/m/MarkovCrusader.java index 328a6f715f..5f4afd2d53 100644 --- a/Mage.Sets/src/mage/cards/m/MarkovCrusader.java +++ b/Mage.Sets/src/mage/cards/m/MarkovCrusader.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -30,7 +29,7 @@ public final class MarkovCrusader extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); } public MarkovCrusader(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MarrowGnawer.java b/Mage.Sets/src/mage/cards/m/MarrowGnawer.java index e3d359f164..cdf48890ef 100644 --- a/Mage.Sets/src/mage/cards/m/MarrowGnawer.java +++ b/Mage.Sets/src/mage/cards/m/MarrowGnawer.java @@ -18,7 +18,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.RatToken; import mage.target.common.TargetControlledPermanent; @@ -33,10 +32,9 @@ public final class MarrowGnawer extends CardImpl { private static final FilterControlledCreaturePermanent filter3 = new FilterControlledCreaturePermanent("the number of Rats you control"); static { - SubtypePredicate ratPredicate = new SubtypePredicate(SubType.RAT); - filterFear.add(ratPredicate); - filterSacrifice.add(ratPredicate); - filter3.add(ratPredicate); + filterFear.add(SubType.RAT.getPredicate()); + filterSacrifice.add(SubType.RAT.getPredicate()); + filter3.add(SubType.RAT.getPredicate()); } public MarrowGnawer (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MarshFlitter.java b/Mage.Sets/src/mage/cards/m/MarshFlitter.java index 88d1b4ea86..2826c03802 100644 --- a/Mage.Sets/src/mage/cards/m/MarshFlitter.java +++ b/Mage.Sets/src/mage/cards/m/MarshFlitter.java @@ -15,7 +15,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.GoblinRogueToken; import mage.target.common.TargetControlledPermanent; @@ -28,7 +27,7 @@ public final class MarshFlitter extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Goblin"); static { - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); } public MarshFlitter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MarshLurker.java b/Mage.Sets/src/mage/cards/m/MarshLurker.java index 8f514a914e..5c85b2b532 100644 --- a/Mage.Sets/src/mage/cards/m/MarshLurker.java +++ b/Mage.Sets/src/mage/cards/m/MarshLurker.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -26,7 +25,7 @@ public final class MarshLurker extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Swamp"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public MarshLurker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MarshdrinkerGiant.java b/Mage.Sets/src/mage/cards/m/MarshdrinkerGiant.java index 03ca2357c6..62a3b22716 100644 --- a/Mage.Sets/src/mage/cards/m/MarshdrinkerGiant.java +++ b/Mage.Sets/src/mage/cards/m/MarshdrinkerGiant.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetLandPermanent; @@ -27,8 +26,8 @@ public final class MarshdrinkerGiant extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.ISLAND), - new SubtypePredicate(SubType.SWAMP))); + SubType.ISLAND.getPredicate(), + SubType.SWAMP.getPredicate())); filter.add(new ControllerPredicate(TargetController.OPPONENT)); } diff --git a/Mage.Sets/src/mage/cards/m/MarwynTheNurturer.java b/Mage.Sets/src/mage/cards/m/MarwynTheNurturer.java index 353450b982..275c4f3d74 100644 --- a/Mage.Sets/src/mage/cards/m/MarwynTheNurturer.java +++ b/Mage.Sets/src/mage/cards/m/MarwynTheNurturer.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -26,7 +25,7 @@ public final class MarwynTheNurturer extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public MarwynTheNurturer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MaskedGorgon.java b/Mage.Sets/src/mage/cards/m/MaskedGorgon.java index a48afc1b7a..052ed94d0f 100644 --- a/Mage.Sets/src/mage/cards/m/MaskedGorgon.java +++ b/Mage.Sets/src/mage/cards/m/MaskedGorgon.java @@ -18,7 +18,6 @@ import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -31,7 +30,7 @@ public final class MaskedGorgon extends CardImpl { static { filter1.add(Predicates.or(new ColorPredicate(ObjectColor.GREEN), new ColorPredicate(ObjectColor.WHITE))); - filter2.add(new SubtypePredicate(SubType.GORGON)); + filter2.add(SubType.GORGON.getPredicate()); } public MaskedGorgon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MassAppeal.java b/Mage.Sets/src/mage/cards/m/MassAppeal.java index fe3ab21a2d..c4310dddb3 100644 --- a/Mage.Sets/src/mage/cards/m/MassAppeal.java +++ b/Mage.Sets/src/mage/cards/m/MassAppeal.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -20,7 +19,7 @@ public final class MassAppeal extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Human you control"); static { - filter.add(new SubtypePredicate(SubType.HUMAN)); + filter.add(SubType.HUMAN.getPredicate()); } public MassAppeal(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/Massacre.java b/Mage.Sets/src/mage/cards/m/Massacre.java index 24af1a59d3..b8c0e5e4cf 100644 --- a/Mage.Sets/src/mage/cards/m/Massacre.java +++ b/Mage.Sets/src/mage/cards/m/Massacre.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,8 +25,8 @@ public final class Massacre extends CardImpl { private static final FilterPermanent filterSwamp = new FilterPermanent(); static { - filterPlains.add(new SubtypePredicate((SubType.PLAINS))); - filterSwamp.add(new SubtypePredicate((SubType.SWAMP))); + filterPlains.add(SubType.PLAINS.getPredicate()); + filterSwamp.add(SubType.SWAMP.getPredicate()); } public Massacre(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MasterApothecary.java b/Mage.Sets/src/mage/cards/m/MasterApothecary.java index bb44e92b0d..8d7f01eb91 100644 --- a/Mage.Sets/src/mage/cards/m/MasterApothecary.java +++ b/Mage.Sets/src/mage/cards/m/MasterApothecary.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetAnyTarget; @@ -29,7 +28,7 @@ public final class MasterApothecary extends CardImpl { static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("an untapped Cleric you control"); static { - filter.add(new SubtypePredicate(SubType.CLERIC)); + filter.add(SubType.CLERIC.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/m/MasterOfThePearlTrident.java b/Mage.Sets/src/mage/cards/m/MasterOfThePearlTrident.java index 3da5723238..b1eb4590e9 100644 --- a/Mage.Sets/src/mage/cards/m/MasterOfThePearlTrident.java +++ b/Mage.Sets/src/mage/cards/m/MasterOfThePearlTrident.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -25,7 +24,7 @@ public final class MasterOfThePearlTrident extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Merfolk creatures"); static { - filter.add(new SubtypePredicate(SubType.MERFOLK)); + filter.add(SubType.MERFOLK.getPredicate()); } public MasterOfThePearlTrident(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MasterOfTheWildHunt.java b/Mage.Sets/src/mage/cards/m/MasterOfTheWildHunt.java index ec5f5d5fc5..8752faef88 100644 --- a/Mage.Sets/src/mage/cards/m/MasterOfTheWildHunt.java +++ b/Mage.Sets/src/mage/cards/m/MasterOfTheWildHunt.java @@ -19,7 +19,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.events.GameEvent.EventType; @@ -68,7 +67,7 @@ class MasterOfTheWildHuntEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new SubtypePredicate(SubType.WOLF)); + filter.add(SubType.WOLF.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/m/MasterTrinketeer.java b/Mage.Sets/src/mage/cards/m/MasterTrinketeer.java index 57e1b95613..0fcc040b78 100644 --- a/Mage.Sets/src/mage/cards/m/MasterTrinketeer.java +++ b/Mage.Sets/src/mage/cards/m/MasterTrinketeer.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.ServoToken; /** @@ -28,8 +27,8 @@ public final class MasterTrinketeer extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Servo and Thopter creatures"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.SERVO), - new SubtypePredicate(SubType.THOPTER))); + filter.add(Predicates.or(SubType.SERVO.getPredicate(), + SubType.THOPTER.getPredicate())); } public MasterTrinketeer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MasterworkOfIngenuity.java b/Mage.Sets/src/mage/cards/m/MasterworkOfIngenuity.java index cb1e31aa5b..4625bff67d 100644 --- a/Mage.Sets/src/mage/cards/m/MasterworkOfIngenuity.java +++ b/Mage.Sets/src/mage/cards/m/MasterworkOfIngenuity.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -21,7 +20,7 @@ public final class MasterworkOfIngenuity extends CardImpl { static { filter.add(CardType.ARTIFACT.getPredicate()); - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); } public MasterworkOfIngenuity(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MaulSplicer.java b/Mage.Sets/src/mage/cards/m/MaulSplicer.java index fa66ead285..7df86001f8 100644 --- a/Mage.Sets/src/mage/cards/m/MaulSplicer.java +++ b/Mage.Sets/src/mage/cards/m/MaulSplicer.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.GolemToken; /** @@ -28,7 +27,7 @@ public final class MaulSplicer extends CardImpl { static { filter.add(CardType.CREATURE.getPredicate()); - filter.add(new SubtypePredicate(SubType.GOLEM)); + filter.add(SubType.GOLEM.getPredicate()); } public MaulSplicer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MausoleumWanderer.java b/Mage.Sets/src/mage/cards/m/MausoleumWanderer.java index b37f3779c8..dc090aa29e 100644 --- a/Mage.Sets/src/mage/cards/m/MausoleumWanderer.java +++ b/Mage.Sets/src/mage/cards/m/MausoleumWanderer.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterInstantOrSorcerySpell; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetSpell; @@ -32,7 +31,7 @@ public final class MausoleumWanderer extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(AnotherPredicate.instance); - filter.add(new SubtypePredicate(SubType.SPIRIT)); + filter.add(SubType.SPIRIT.getPredicate()); } public MausoleumWanderer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MavrenFeinDuskApostle.java b/Mage.Sets/src/mage/cards/m/MavrenFeinDuskApostle.java index 98fe12b17d..792b98107c 100644 --- a/Mage.Sets/src/mage/cards/m/MavrenFeinDuskApostle.java +++ b/Mage.Sets/src/mage/cards/m/MavrenFeinDuskApostle.java @@ -14,7 +14,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; @@ -56,7 +55,7 @@ class MavrenFeinDuskApostleTriggeredAbility extends TriggeredAbilityImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken Vampires you control"); static { - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); filter.add(Predicates.not(TokenPredicate.instance)); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/m/MayorOfAvabruck.java b/Mage.Sets/src/mage/cards/m/MayorOfAvabruck.java index eb789d8aca..2a478dad43 100644 --- a/Mage.Sets/src/mage/cards/m/MayorOfAvabruck.java +++ b/Mage.Sets/src/mage/cards/m/MayorOfAvabruck.java @@ -20,7 +20,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @author North, noxx @@ -32,7 +31,7 @@ public final class MayorOfAvabruck extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Human creatures"); static { - filter.add(new SubtypePredicate(SubType.HUMAN)); + filter.add(SubType.HUMAN.getPredicate()); } public MayorOfAvabruck(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MazesEnd.java b/Mage.Sets/src/mage/cards/m/MazesEnd.java index c575930d28..10acaad038 100644 --- a/Mage.Sets/src/mage/cards/m/MazesEnd.java +++ b/Mage.Sets/src/mage/cards/m/MazesEnd.java @@ -19,7 +19,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -38,7 +37,7 @@ public final class MazesEnd extends CardImpl { private static final FilterCard filterCard = new FilterCard("Gate card"); static { - filterCard.add(new SubtypePredicate(SubType.GATE)); + filterCard.add(SubType.GATE.getPredicate()); } public MazesEnd(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MercenaryInformer.java b/Mage.Sets/src/mage/cards/m/MercenaryInformer.java index e50658d5fa..d744e2804c 100644 --- a/Mage.Sets/src/mage/cards/m/MercenaryInformer.java +++ b/Mage.Sets/src/mage/cards/m/MercenaryInformer.java @@ -21,7 +21,6 @@ import mage.filter.FilterPermanent; import mage.filter.FilterStackObject; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.target.TargetPermanent; @@ -37,7 +36,7 @@ public final class MercenaryInformer extends CardImpl { static { filterBlack.add(new ColorPredicate(ObjectColor.BLACK)); filterMercenary.add(Predicates.not(TokenPredicate.instance)); - filterMercenary.add(new SubtypePredicate(SubType.MERCENARY)); + filterMercenary.add(SubType.MERCENARY.getPredicate()); } public MercenaryInformer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MerfolkMistbinder.java b/Mage.Sets/src/mage/cards/m/MerfolkMistbinder.java index 85deae54b3..a995467737 100644 --- a/Mage.Sets/src/mage/cards/m/MerfolkMistbinder.java +++ b/Mage.Sets/src/mage/cards/m/MerfolkMistbinder.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -25,7 +24,7 @@ public final class MerfolkMistbinder extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Merfolk you control"); static { - filter.add(new SubtypePredicate(SubType.MERFOLK)); + filter.add(SubType.MERFOLK.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/m/MerfolkSovereign.java b/Mage.Sets/src/mage/cards/m/MerfolkSovereign.java index c39b6fbaaf..7d09e2b253 100644 --- a/Mage.Sets/src/mage/cards/m/MerfolkSovereign.java +++ b/Mage.Sets/src/mage/cards/m/MerfolkSovereign.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -28,8 +27,8 @@ public final class MerfolkSovereign extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("Merfolk creature"); static { - filter1.add(new SubtypePredicate(SubType.MERFOLK)); - filter2.add(new SubtypePredicate(SubType.MERFOLK)); + filter1.add(SubType.MERFOLK.getPredicate()); + filter2.add(SubType.MERFOLK.getPredicate()); } public MerfolkSovereign(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MerfolkWayfinder.java b/Mage.Sets/src/mage/cards/m/MerfolkWayfinder.java index fe4b90402b..ebe9a1e920 100644 --- a/Mage.Sets/src/mage/cards/m/MerfolkWayfinder.java +++ b/Mage.Sets/src/mage/cards/m/MerfolkWayfinder.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -23,7 +22,7 @@ public final class MerfolkWayfinder extends CardImpl { private static final FilterCard filter = new FilterCard("all Island cards"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/m/MerrowCommerce.java b/Mage.Sets/src/mage/cards/m/MerrowCommerce.java index 323a658a6f..b50d4bc4a2 100644 --- a/Mage.Sets/src/mage/cards/m/MerrowCommerce.java +++ b/Mage.Sets/src/mage/cards/m/MerrowCommerce.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -20,7 +19,7 @@ public final class MerrowCommerce extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Merfolk you control"); static { - filter.add(new SubtypePredicate(SubType.MERFOLK)); + filter.add(SubType.MERFOLK.getPredicate()); } public MerrowCommerce(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MerrowHarbinger.java b/Mage.Sets/src/mage/cards/m/MerrowHarbinger.java index 1d719f3001..af1ea8a892 100644 --- a/Mage.Sets/src/mage/cards/m/MerrowHarbinger.java +++ b/Mage.Sets/src/mage/cards/m/MerrowHarbinger.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -24,7 +23,7 @@ public final class MerrowHarbinger extends CardImpl { static final FilterCard filter = new FilterCard("Merfolk card"); static { - filter.add(new SubtypePredicate(SubType.MERFOLK )); + filter.add(SubType.MERFOLK .getPredicate()); } public MerrowHarbinger(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MerrowReejerey.java b/Mage.Sets/src/mage/cards/m/MerrowReejerey.java index b5703237e5..7ee84afcea 100644 --- a/Mage.Sets/src/mage/cards/m/MerrowReejerey.java +++ b/Mage.Sets/src/mage/cards/m/MerrowReejerey.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterSpell; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.TargetPermanent; @@ -28,9 +27,9 @@ public final class MerrowReejerey extends CardImpl { private static final FilterSpell filter2 = new FilterSpell("Merfolk spell"); static { - filter1.add(new SubtypePredicate(SubType.MERFOLK)); + filter1.add(SubType.MERFOLK.getPredicate()); filter1.add(new ControllerPredicate(TargetController.YOU)); - filter2.add(new SubtypePredicate(SubType.MERFOLK)); + filter2.add(SubType.MERFOLK.getPredicate()); } public MerrowReejerey(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MesmericSliver.java b/Mage.Sets/src/mage/cards/m/MesmericSliver.java index 1933f66e3d..445ccf64c0 100644 --- a/Mage.Sets/src/mage/cards/m/MesmericSliver.java +++ b/Mage.Sets/src/mage/cards/m/MesmericSliver.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class MesmericSliver extends CardImpl { private static final FilterCreaturePermanent filterSliver = new FilterCreaturePermanent(); static { - filterSliver.add(new SubtypePredicate(SubType.SLIVER)); + filterSliver.add(SubType.SLIVER.getPredicate()); } public MesmericSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MidnightDuelist.java b/Mage.Sets/src/mage/cards/m/MidnightDuelist.java index cea70bd1ad..27e8381351 100644 --- a/Mage.Sets/src/mage/cards/m/MidnightDuelist.java +++ b/Mage.Sets/src/mage/cards/m/MidnightDuelist.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class MidnightDuelist extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("Vampires"); static { - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); } public MidnightDuelist(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MidnightEntourage.java b/Mage.Sets/src/mage/cards/m/MidnightEntourage.java index 4fdd87ec21..3c755aac02 100644 --- a/Mage.Sets/src/mage/cards/m/MidnightEntourage.java +++ b/Mage.Sets/src/mage/cards/m/MidnightEntourage.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import java.util.UUID; @@ -25,7 +24,7 @@ public final class MidnightEntourage extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Aetherborn you control"); static { - filter.add(new SubtypePredicate(SubType.AETHERBORN)); + filter.add(SubType.AETHERBORN.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/m/MightSliver.java b/Mage.Sets/src/mage/cards/m/MightSliver.java index 1771128062..8d10b83df7 100644 --- a/Mage.Sets/src/mage/cards/m/MightSliver.java +++ b/Mage.Sets/src/mage/cards/m/MightSliver.java @@ -12,7 +12,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -23,7 +22,7 @@ public final class MightSliver extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("All Sliver creatures"); static { - filter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); } public MightSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MikaeusTheUnhallowed.java b/Mage.Sets/src/mage/cards/m/MikaeusTheUnhallowed.java index 3ec5f444f1..c42b1c8cdb 100644 --- a/Mage.Sets/src/mage/cards/m/MikaeusTheUnhallowed.java +++ b/Mage.Sets/src/mage/cards/m/MikaeusTheUnhallowed.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -31,7 +30,7 @@ public final class MikaeusTheUnhallowed extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Human creatures"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.HUMAN))); + filter.add(Predicates.not(SubType.HUMAN.getPredicate())); } public MikaeusTheUnhallowed(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MilitantInquisitor.java b/Mage.Sets/src/mage/cards/m/MilitantInquisitor.java index c5f7455d98..9a6b18cc8b 100644 --- a/Mage.Sets/src/mage/cards/m/MilitantInquisitor.java +++ b/Mage.Sets/src/mage/cards/m/MilitantInquisitor.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class MilitantInquisitor extends CardImpl { static { filter.add(CardType.ARTIFACT.getPredicate()); - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); } public MilitantInquisitor(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MindSludge.java b/Mage.Sets/src/mage/cards/m/MindSludge.java index debe879007..d8d10a9115 100644 --- a/Mage.Sets/src/mage/cards/m/MindSludge.java +++ b/Mage.Sets/src/mage/cards/m/MindSludge.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPlayer; @@ -23,7 +22,7 @@ public final class MindSludge extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Swamp you control"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/m/MindSwords.java b/Mage.Sets/src/mage/cards/m/MindSwords.java index 02fb636664..59bc44334a 100644 --- a/Mage.Sets/src/mage/cards/m/MindSwords.java +++ b/Mage.Sets/src/mage/cards/m/MindSwords.java @@ -20,7 +20,6 @@ import mage.constants.Zone; import mage.filter.FilterCard; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.Target; @@ -36,7 +35,7 @@ public final class MindSwords extends CardImpl { private static final FilterLandPermanent filterSwamp = new FilterLandPermanent("If you control a Swamp"); static { - filterSwamp.add(new SubtypePredicate(SubType.SWAMP)); + filterSwamp.add(SubType.SWAMP.getPredicate()); } public MindSwords(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MindlashSliver.java b/Mage.Sets/src/mage/cards/m/MindlashSliver.java index 46a7d2a506..080ad92679 100644 --- a/Mage.Sets/src/mage/cards/m/MindlashSliver.java +++ b/Mage.Sets/src/mage/cards/m/MindlashSliver.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -28,7 +27,7 @@ public final class MindlashSliver extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); } public MindlashSliver(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}"); diff --git a/Mage.Sets/src/mage/cards/m/MindlessNull.java b/Mage.Sets/src/mage/cards/m/MindlessNull.java index 3336302153..f963c98434 100644 --- a/Mage.Sets/src/mage/cards/m/MindlessNull.java +++ b/Mage.Sets/src/mage/cards/m/MindlessNull.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -21,7 +20,7 @@ public final class MindlessNull extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Vampire"); static { - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); } public MindlessNull(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}"); diff --git a/Mage.Sets/src/mage/cards/m/MindwhipSliver.java b/Mage.Sets/src/mage/cards/m/MindwhipSliver.java index 9c348cfea6..956591a161 100644 --- a/Mage.Sets/src/mage/cards/m/MindwhipSliver.java +++ b/Mage.Sets/src/mage/cards/m/MindwhipSliver.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -28,7 +27,7 @@ public final class MindwhipSliver extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("All Slivers"); static { - filter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); } public MindwhipSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MiracleWorker.java b/Mage.Sets/src/mage/cards/m/MiracleWorker.java index e77491453a..6bb3a3ee59 100644 --- a/Mage.Sets/src/mage/cards/m/MiracleWorker.java +++ b/Mage.Sets/src/mage/cards/m/MiracleWorker.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AttachedToControlledPermanentPredicate; import mage.filter.predicate.permanent.AttachedToPredicate; import mage.target.TargetPermanent; @@ -29,7 +28,7 @@ public final class MiracleWorker extends CardImpl { static { filter.add(new AttachedToControlledPermanentPredicate()); filter.add(new AttachedToPredicate(new FilterCreaturePermanent())); - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); } public MiracleWorker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MireKavu.java b/Mage.Sets/src/mage/cards/m/MireKavu.java index e881328f8c..fbd9edc6f8 100644 --- a/Mage.Sets/src/mage/cards/m/MireKavu.java +++ b/Mage.Sets/src/mage/cards/m/MireKavu.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class MireKavu extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Swamp"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public MireKavu(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MireShade.java b/Mage.Sets/src/mage/cards/m/MireShade.java index 71f0881c47..d542a3297f 100644 --- a/Mage.Sets/src/mage/cards/m/MireShade.java +++ b/Mage.Sets/src/mage/cards/m/MireShade.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -27,7 +26,7 @@ public final class MireShade extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Swamp"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public MireShade(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MiresToll.java b/Mage.Sets/src/mage/cards/m/MiresToll.java index 110ba8baf4..226c5ed6a7 100644 --- a/Mage.Sets/src/mage/cards/m/MiresToll.java +++ b/Mage.Sets/src/mage/cards/m/MiresToll.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPlayer; @@ -23,7 +22,7 @@ public final class MiresToll extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("the number of Swamps you control"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/m/MiseryCharm.java b/Mage.Sets/src/mage/cards/m/MiseryCharm.java index c0195ee953..ca588bc56e 100644 --- a/Mage.Sets/src/mage/cards/m/MiseryCharm.java +++ b/Mage.Sets/src/mage/cards/m/MiseryCharm.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import mage.target.TargetPlayer; import mage.target.common.TargetCardInYourGraveyard; @@ -27,8 +26,8 @@ public final class MiseryCharm extends CardImpl { private static final FilterCard filter2 = new FilterCard("Cleric card from your graveyard"); static { - filter1.add(new SubtypePredicate(SubType.CLERIC)); - filter2.add(new SubtypePredicate(SubType.CLERIC)); + filter1.add(SubType.CLERIC.getPredicate()); + filter2.add(SubType.CLERIC.getPredicate()); } public MiseryCharm(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MishrasFactory.java b/Mage.Sets/src/mage/cards/m/MishrasFactory.java index a75854afe4..12af4da76a 100644 --- a/Mage.Sets/src/mage/cards/m/MishrasFactory.java +++ b/Mage.Sets/src/mage/cards/m/MishrasFactory.java @@ -16,9 +16,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.TokenImpl; -import mage.game.permanent.token.Token; import mage.target.common.TargetCreaturePermanent; /** @@ -30,7 +28,7 @@ public final class MishrasFactory extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Assembly-Worker creature"); static { - filter.add(new SubtypePredicate(SubType.ASSEMBLY_WORKER)); + filter.add(SubType.ASSEMBLY_WORKER.getPredicate()); } public MishrasFactory(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MistfordRiverTurtle.java b/Mage.Sets/src/mage/cards/m/MistfordRiverTurtle.java index 3bfb928789..c784a8a602 100644 --- a/Mage.Sets/src/mage/cards/m/MistfordRiverTurtle.java +++ b/Mage.Sets/src/mage/cards/m/MistfordRiverTurtle.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.AttackingPredicate; import mage.target.TargetPermanent; @@ -30,7 +29,7 @@ public final class MistfordRiverTurtle extends CardImpl { static { filter.add(AnotherPredicate.instance); filter.add(AttackingPredicate.instance); - filter.add(Predicates.not(new SubtypePredicate(SubType.HUMAN))); + filter.add(Predicates.not(SubType.HUMAN.getPredicate())); } public MistfordRiverTurtle(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/Mobilization.java b/Mage.Sets/src/mage/cards/m/Mobilization.java index 18027fe99d..bba93fd06a 100644 --- a/Mage.Sets/src/mage/cards/m/Mobilization.java +++ b/Mage.Sets/src/mage/cards/m/Mobilization.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SoldierToken; /** @@ -27,7 +26,7 @@ public final class Mobilization extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Soldier creatures"); static { - filter.add(new SubtypePredicate(SubType.SOLDIER)); + filter.add(SubType.SOLDIER.getPredicate()); } public Mobilization(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MoggAlarm.java b/Mage.Sets/src/mage/cards/m/MoggAlarm.java index 822b689662..cff6a4c29d 100644 --- a/Mage.Sets/src/mage/cards/m/MoggAlarm.java +++ b/Mage.Sets/src/mage/cards/m/MoggAlarm.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.GoblinToken; import mage.target.common.TargetControlledPermanent; @@ -22,7 +21,7 @@ public final class MoggAlarm extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("two Mountains"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public MoggAlarm(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MoggRaider.java b/Mage.Sets/src/mage/cards/m/MoggRaider.java index 33783e36ad..3051b73712 100644 --- a/Mage.Sets/src/mage/cards/m/MoggRaider.java +++ b/Mage.Sets/src/mage/cards/m/MoggRaider.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -27,7 +26,7 @@ public final class MoggRaider extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Goblin"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public MoggRaider(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MoggSalvage.java b/Mage.Sets/src/mage/cards/m/MoggSalvage.java index d45d5d2af7..8b7bbdf4e7 100644 --- a/Mage.Sets/src/mage/cards/m/MoggSalvage.java +++ b/Mage.Sets/src/mage/cards/m/MoggSalvage.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetArtifactPermanent; /** @@ -26,8 +25,8 @@ public final class MoggSalvage extends CardImpl { private static final FilterPermanent filterIsland = new FilterPermanent(); static { - filterMountain.add(new SubtypePredicate(SubType.MOUNTAIN)); - filterIsland.add(new SubtypePredicate(SubType.ISLAND)); + filterMountain.add(SubType.MOUNTAIN.getPredicate()); + filterIsland.add(SubType.ISLAND.getPredicate()); } public MoggSalvage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/Moggcatcher.java b/Mage.Sets/src/mage/cards/m/Moggcatcher.java index 362e597880..5e43b3d19d 100644 --- a/Mage.Sets/src/mage/cards/m/Moggcatcher.java +++ b/Mage.Sets/src/mage/cards/m/Moggcatcher.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -26,7 +25,7 @@ public final class Moggcatcher extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("Goblin permanent card"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public Moggcatcher(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MoldDemon.java b/Mage.Sets/src/mage/cards/m/MoldDemon.java index afe35a755e..f7a9944ccb 100644 --- a/Mage.Sets/src/mage/cards/m/MoldDemon.java +++ b/Mage.Sets/src/mage/cards/m/MoldDemon.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -23,7 +22,7 @@ public final class MoldDemon extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("two Swamps"); static{ - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public MoldDemon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/Monsoon.java b/Mage.Sets/src/mage/cards/m/Monsoon.java index 24c52740c5..d2f614ea09 100644 --- a/Mage.Sets/src/mage/cards/m/Monsoon.java +++ b/Mage.Sets/src/mage/cards/m/Monsoon.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -49,7 +48,7 @@ class MonsoonEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterPermanent(); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/m/MoonlightHunt.java b/Mage.Sets/src/mage/cards/m/MoonlightHunt.java index a5d51d980e..4df4ab4481 100644 --- a/Mage.Sets/src/mage/cards/m/MoonlightHunt.java +++ b/Mage.Sets/src/mage/cards/m/MoonlightHunt.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -54,7 +53,7 @@ class MoonlightHuntEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.WOLF), new SubtypePredicate(SubType.WEREWOLF))); + filter.add(Predicates.or(SubType.WOLF.getPredicate(), SubType.WEREWOLF.getPredicate())); } public MoonlightHuntEffect() { diff --git a/Mage.Sets/src/mage/cards/m/Moonmist.java b/Mage.Sets/src/mage/cards/m/Moonmist.java index a90d6b45d6..7f8f211cb1 100644 --- a/Mage.Sets/src/mage/cards/m/Moonmist.java +++ b/Mage.Sets/src/mage/cards/m/Moonmist.java @@ -13,7 +13,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -26,8 +25,8 @@ public final class Moonmist extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures other than Werewolves and Wolves"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.WEREWOLF))); - filter.add(Predicates.not(new SubtypePredicate(SubType.WOLF))); + filter.add(Predicates.not(SubType.WEREWOLF.getPredicate())); + filter.add(Predicates.not(SubType.WOLF.getPredicate())); } public Moonmist(UUID ownerId, CardSetInfo setInfo) { @@ -54,7 +53,7 @@ class MoonmistEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("humans"); static { - filter.add(new SubtypePredicate(SubType.HUMAN)); + filter.add(SubType.HUMAN.getPredicate()); } public MoonmistEffect() { diff --git a/Mage.Sets/src/mage/cards/m/MtendaGriffin.java b/Mage.Sets/src/mage/cards/m/MtendaGriffin.java index afa4b54c14..5cf8bcdca9 100644 --- a/Mage.Sets/src/mage/cards/m/MtendaGriffin.java +++ b/Mage.Sets/src/mage/cards/m/MtendaGriffin.java @@ -19,7 +19,6 @@ import mage.constants.PhaseStep; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.Target; import mage.target.common.TargetCardInYourGraveyard; @@ -32,7 +31,7 @@ public final class MtendaGriffin extends CardImpl { private static final FilterCard filter = new FilterCard("Griffin card from your graveyard"); static { - filter.add(new SubtypePredicate(SubType.GRIFFIN)); + filter.add(SubType.GRIFFIN.getPredicate()); } public MtendaGriffin(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MudTrooper.java b/Mage.Sets/src/mage/cards/m/MudTrooper.java index 0fc2f6d128..51472b51e2 100644 --- a/Mage.Sets/src/mage/cards/m/MudTrooper.java +++ b/Mage.Sets/src/mage/cards/m/MudTrooper.java @@ -5,9 +5,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.costs.mana.ColorlessManaCost; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.constants.Duration; @@ -17,7 +15,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -28,7 +25,7 @@ public final class MudTrooper extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Trooper creatures you control"); static { - filter.add(new SubtypePredicate(SubType.TROOPER)); + filter.add(SubType.TROOPER.getPredicate()); } public MudTrooper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MummyParamount.java b/Mage.Sets/src/mage/cards/m/MummyParamount.java index 4555272f37..a8b0add6e6 100644 --- a/Mage.Sets/src/mage/cards/m/MummyParamount.java +++ b/Mage.Sets/src/mage/cards/m/MummyParamount.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -22,7 +21,7 @@ public final class MummyParamount extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("another Zombie"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/m/MundaAmbushLeader.java b/Mage.Sets/src/mage/cards/m/MundaAmbushLeader.java index 6473d3baf8..88a3d81a16 100644 --- a/Mage.Sets/src/mage/cards/m/MundaAmbushLeader.java +++ b/Mage.Sets/src/mage/cards/m/MundaAmbushLeader.java @@ -14,7 +14,6 @@ import mage.cards.Cards; import mage.cards.CardsImpl; import mage.constants.*; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; @@ -55,7 +54,7 @@ class MundaAmbushLeaderEffect extends OneShotEffect { private static final FilterCard filter = new FilterCard("Ally cards to reveal and put on top of your library"); static { - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); } public MundaAmbushLeaderEffect() { diff --git a/Mage.Sets/src/mage/cards/m/MundasVanguard.java b/Mage.Sets/src/mage/cards/m/MundasVanguard.java index 52708a4928..8a1bb90480 100644 --- a/Mage.Sets/src/mage/cards/m/MundasVanguard.java +++ b/Mage.Sets/src/mage/cards/m/MundasVanguard.java @@ -18,7 +18,6 @@ import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -31,7 +30,7 @@ public final class MundasVanguard extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("an untapped Ally you control"); static { - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/m/MurasaPyromancer.java b/Mage.Sets/src/mage/cards/m/MurasaPyromancer.java index af954f5dda..310a32905b 100644 --- a/Mage.Sets/src/mage/cards/m/MurasaPyromancer.java +++ b/Mage.Sets/src/mage/cards/m/MurasaPyromancer.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -26,7 +25,7 @@ public final class MurasaPyromancer extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Ally you control"); static { - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/m/MurmuringBosk.java b/Mage.Sets/src/mage/cards/m/MurmuringBosk.java index 0439e6c949..8e92566cdc 100644 --- a/Mage.Sets/src/mage/cards/m/MurmuringBosk.java +++ b/Mage.Sets/src/mage/cards/m/MurmuringBosk.java @@ -15,7 +15,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; /** @@ -27,7 +26,7 @@ public final class MurmuringBosk extends CardImpl { private static final FilterCard filter = new FilterCard("a Treefolk card from your hand"); static { - filter.add(new SubtypePredicate(SubType.TREEFOLK)); + filter.add(SubType.TREEFOLK.getPredicate()); } public MurmuringBosk(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MuscleSliver.java b/Mage.Sets/src/mage/cards/m/MuscleSliver.java index cd6725c4db..1ec811f40d 100644 --- a/Mage.Sets/src/mage/cards/m/MuscleSliver.java +++ b/Mage.Sets/src/mage/cards/m/MuscleSliver.java @@ -12,7 +12,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @author Loki @@ -22,7 +21,7 @@ public final class MuscleSliver extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("All Sliver creatures"); static { - filter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); } public MuscleSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/Mutilate.java b/Mage.Sets/src/mage/cards/m/Mutilate.java index 893c0e985b..a37e66e33d 100644 --- a/Mage.Sets/src/mage/cards/m/Mutilate.java +++ b/Mage.Sets/src/mage/cards/m/Mutilate.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -28,7 +27,7 @@ public final class Mutilate extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Swamp you control"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/m/MwonvuliAcidMoss.java b/Mage.Sets/src/mage/cards/m/MwonvuliAcidMoss.java index a280aac95f..5ac2c42a40 100644 --- a/Mage.Sets/src/mage/cards/m/MwonvuliAcidMoss.java +++ b/Mage.Sets/src/mage/cards/m/MwonvuliAcidMoss.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterLandCard; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCardInLibrary; @@ -23,7 +22,7 @@ public final class MwonvuliAcidMoss extends CardImpl { private static final FilterLandCard filterForest = new FilterLandCard("Forest card"); static { - filterForest.add(new SubtypePredicate(SubType.FOREST)); + filterForest.add(SubType.FOREST.getPredicate()); } public MwonvuliAcidMoss(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/Mycologist.java b/Mage.Sets/src/mage/cards/m/Mycologist.java index 381aac6559..7f24784355 100644 --- a/Mage.Sets/src/mage/cards/m/Mycologist.java +++ b/Mage.Sets/src/mage/cards/m/Mycologist.java @@ -18,7 +18,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SaprolingToken; import mage.target.common.TargetControlledPermanent; @@ -31,7 +30,7 @@ public final class Mycologist extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Saproling"); static { - filter.add(new SubtypePredicate(SubType.SAPROLING)); + filter.add(SubType.SAPROLING.getPredicate()); } public Mycologist(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MyrBattlesphere.java b/Mage.Sets/src/mage/cards/m/MyrBattlesphere.java index b43eed17cc..23a755af49 100644 --- a/Mage.Sets/src/mage/cards/m/MyrBattlesphere.java +++ b/Mage.Sets/src/mage/cards/m/MyrBattlesphere.java @@ -21,7 +21,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -106,7 +105,7 @@ class MyrBattlesphereEffect extends OneShotEffect { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new SubtypePredicate(SubType.MYR)); + filter.add(SubType.MYR.getPredicate()); } public MyrBattlesphereEffect() { diff --git a/Mage.Sets/src/mage/cards/m/MyrGalvanizer.java b/Mage.Sets/src/mage/cards/m/MyrGalvanizer.java index 45fafbacd9..76559eebc7 100644 --- a/Mage.Sets/src/mage/cards/m/MyrGalvanizer.java +++ b/Mage.Sets/src/mage/cards/m/MyrGalvanizer.java @@ -15,7 +15,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -27,7 +26,7 @@ public final class MyrGalvanizer extends CardImpl { static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Myr creatures"); static { - filter.add(new SubtypePredicate(SubType.MYR)); + filter.add(SubType.MYR.getPredicate()); } public MyrGalvanizer (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MyrMatrix.java b/Mage.Sets/src/mage/cards/m/MyrMatrix.java index 0c55dfd578..171deab931 100644 --- a/Mage.Sets/src/mage/cards/m/MyrMatrix.java +++ b/Mage.Sets/src/mage/cards/m/MyrMatrix.java @@ -16,7 +16,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.MyrToken; /** @@ -28,7 +27,7 @@ public final class MyrMatrix extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Myr"); static { - filter.add(new SubtypePredicate(SubType.MYR)); + filter.add(SubType.MYR.getPredicate()); } public MyrMatrix (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MyrReservoir.java b/Mage.Sets/src/mage/cards/m/MyrReservoir.java index 2f2f362306..d6d66099a1 100644 --- a/Mage.Sets/src/mage/cards/m/MyrReservoir.java +++ b/Mage.Sets/src/mage/cards/m/MyrReservoir.java @@ -19,7 +19,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.target.common.TargetCardInYourGraveyard; @@ -31,7 +30,7 @@ public final class MyrReservoir extends CardImpl { private static final FilterCard myrCardFilter = new FilterCard("Myr card from your graveyard"); static { - myrCardFilter.add(new SubtypePredicate(SubType.MYR)); + myrCardFilter.add(SubType.MYR.getPredicate()); } public MyrReservoir(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MyrTurbine.java b/Mage.Sets/src/mage/cards/m/MyrTurbine.java index 5c520f4261..92f13124ae 100644 --- a/Mage.Sets/src/mage/cards/m/MyrTurbine.java +++ b/Mage.Sets/src/mage/cards/m/MyrTurbine.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.MyrToken; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledPermanent; @@ -29,8 +28,8 @@ public final class MyrTurbine extends CardImpl { private static final FilterControlledPermanent filterMyr = new FilterControlledPermanent("Myr you control"); static { - filterCard.add(new SubtypePredicate(SubType.MYR)); - filterMyr.add(new SubtypePredicate(SubType.MYR)); + filterCard.add(SubType.MYR.getPredicate()); + filterMyr.add(SubType.MYR.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/m/MyriadLandscape.java b/Mage.Sets/src/mage/cards/m/MyriadLandscape.java index a88e3285de..fa87e597e2 100644 --- a/Mage.Sets/src/mage/cards/m/MyriadLandscape.java +++ b/Mage.Sets/src/mage/cards/m/MyriadLandscape.java @@ -1,6 +1,5 @@ package mage.cards.m; -import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -19,18 +18,15 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.game.Game; import mage.target.common.TargetCardInLibrary; import mage.util.SubTypeList; -import java.util.ArrayList; import java.util.Iterator; -import java.util.List; import java.util.UUID; +import java.util.stream.Collectors; /** * @author LevelX2 @@ -71,11 +67,12 @@ class TargetCardInLibrarySharingLandType extends TargetCardInLibrary { private static final FilterCard filterBasicLandCard = new FilterCard("basic land card"); static { - List> subTypePreds = new ArrayList<>(); - for (SubType landType : SubType.getLandTypes()) { - subTypePreds.add(new SubtypePredicate(landType)); - } - filterBasicLandCard.add(Predicates.or(subTypePreds)); + filterBasicLandCard.add(Predicates.or( + SubType.getLandTypes() + .stream() + .map(SubType::getPredicate) + .collect(Collectors.toSet()) + )); filterBasicLandCard.add(new SupertypePredicate(SuperType.BASIC)); } diff --git a/Mage.Sets/src/mage/cards/n/NagaoBoundByHonor.java b/Mage.Sets/src/mage/cards/n/NagaoBoundByHonor.java index 7f387e112c..3914ea76b2 100644 --- a/Mage.Sets/src/mage/cards/n/NagaoBoundByHonor.java +++ b/Mage.Sets/src/mage/cards/n/NagaoBoundByHonor.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class NagaoBoundByHonor extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Samurai creatures"); static { - filter.add(new SubtypePredicate(SubType.SAMURAI)); + filter.add(SubType.SAMURAI.getPredicate()); } public NagaoBoundByHonor(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NahiriTheLithomancer.java b/Mage.Sets/src/mage/cards/n/NahiriTheLithomancer.java index 4a93fc8937..55746eec97 100644 --- a/Mage.Sets/src/mage/cards/n/NahiriTheLithomancer.java +++ b/Mage.Sets/src/mage/cards/n/NahiriTheLithomancer.java @@ -19,7 +19,6 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.KorSoldierToken; @@ -74,7 +73,7 @@ class NahiriTheLithomancerFirstAbilityEffect extends OneShotEffect { private static final FilterControlledPermanent filter = new FilterControlledPermanent("an Equipment you control"); static { - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); } NahiriTheLithomancerFirstAbilityEffect() { @@ -130,7 +129,7 @@ class NahiriTheLithomancerSecondAbilityEffect extends OneShotEffect { private static final FilterCard filter = new FilterCard("an Equipment"); static { - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); } NahiriTheLithomancerSecondAbilityEffect() { diff --git a/Mage.Sets/src/mage/cards/n/NamelessOne.java b/Mage.Sets/src/mage/cards/n/NamelessOne.java index c54d3480ad..470492078e 100644 --- a/Mage.Sets/src/mage/cards/n/NamelessOne.java +++ b/Mage.Sets/src/mage/cards/n/NamelessOne.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class NamelessOne extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Wizards on the battlefield"); static { - filter.add(new SubtypePredicate(SubType.WIZARD)); + filter.add(SubType.WIZARD.getPredicate()); } public NamelessOne(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NathsBuffoon.java b/Mage.Sets/src/mage/cards/n/NathsBuffoon.java index 26ae3f00bf..5bae7ab29b 100644 --- a/Mage.Sets/src/mage/cards/n/NathsBuffoon.java +++ b/Mage.Sets/src/mage/cards/n/NathsBuffoon.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -20,7 +19,7 @@ public final class NathsBuffoon extends CardImpl { private static final FilterCard filter = new FilterCard("Elves"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public NathsBuffoon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NaturesLore.java b/Mage.Sets/src/mage/cards/n/NaturesLore.java index bb8dba1ca6..3869def9a7 100644 --- a/Mage.Sets/src/mage/cards/n/NaturesLore.java +++ b/Mage.Sets/src/mage/cards/n/NaturesLore.java @@ -7,7 +7,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; import java.util.UUID; @@ -21,7 +20,7 @@ public final class NaturesLore extends CardImpl { private static final FilterCard filter = new FilterCard("Forest card"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public NaturesLore(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NaturesWrath.java b/Mage.Sets/src/mage/cards/n/NaturesWrath.java index 6c2f7ad6ff..f7b64e9a4b 100644 --- a/Mage.Sets/src/mage/cards/n/NaturesWrath.java +++ b/Mage.Sets/src/mage/cards/n/NaturesWrath.java @@ -3,7 +3,6 @@ package mage.cards.n; import java.util.UUID; import mage.ObjectColor; -import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -17,10 +16,8 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.StaticFilters; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -29,12 +26,12 @@ import mage.filter.predicate.mageobject.SubtypePredicate; public final class NaturesWrath extends CardImpl { private static final FilterPermanent filterBlue = new FilterPermanent("an Island or blue permanent"); static{ - filterBlue.add(Predicates.or(new ColorPredicate(ObjectColor.BLUE), new SubtypePredicate(SubType.ISLAND))); + filterBlue.add(Predicates.or(new ColorPredicate(ObjectColor.BLUE), SubType.ISLAND.getPredicate())); } private static final FilterPermanent filterBlack = new FilterPermanent("a Swamp or black permanent"); static{ - filterBlack.add(Predicates.or(new ColorPredicate(ObjectColor.BLACK), new SubtypePredicate(SubType.SWAMP))); + filterBlack.add(Predicates.or(new ColorPredicate(ObjectColor.BLACK), SubType.SWAMP.getPredicate())); } public NaturesWrath(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NayaPanorama.java b/Mage.Sets/src/mage/cards/n/NayaPanorama.java index df2d342629..2927cc3d44 100644 --- a/Mage.Sets/src/mage/cards/n/NayaPanorama.java +++ b/Mage.Sets/src/mage/cards/n/NayaPanorama.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; @@ -31,9 +30,9 @@ public final class NayaPanorama extends CardImpl { filter.add(CardType.LAND.getPredicate()); filter.add(new SupertypePredicate(SuperType.BASIC)); filter.add(Predicates.or( - new SubtypePredicate(SubType.MOUNTAIN), - new SubtypePredicate(SubType.FOREST), - new SubtypePredicate(SubType.PLAINS))); + SubType.MOUNTAIN.getPredicate(), + SubType.FOREST.getPredicate(), + SubType.PLAINS.getPredicate())); } public NayaPanorama(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NazahnReveredBladesmith.java b/Mage.Sets/src/mage/cards/n/NazahnReveredBladesmith.java index bc48df33e5..cabe06d449 100644 --- a/Mage.Sets/src/mage/cards/n/NazahnReveredBladesmith.java +++ b/Mage.Sets/src/mage/cards/n/NazahnReveredBladesmith.java @@ -17,7 +17,6 @@ import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.EquippedPredicate; @@ -45,7 +44,7 @@ public final class NazahnReveredBladesmith extends CardImpl { static { filter.add(CardType.ARTIFACT.getPredicate()); - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); } public NazahnReveredBladesmith(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NebelgastHerald.java b/Mage.Sets/src/mage/cards/n/NebelgastHerald.java index d0965658ed..69d68b2586 100644 --- a/Mage.Sets/src/mage/cards/n/NebelgastHerald.java +++ b/Mage.Sets/src/mage/cards/n/NebelgastHerald.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -30,7 +29,7 @@ public final class NebelgastHerald extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.SPIRIT)); + filter.add(SubType.SPIRIT.getPredicate()); filterTarget.add(new ControllerPredicate(TargetController.OPPONENT)); } diff --git a/Mage.Sets/src/mage/cards/n/NecromancersCovenant.java b/Mage.Sets/src/mage/cards/n/NecromancersCovenant.java index 88ec3503d5..c9f7e8c9fd 100644 --- a/Mage.Sets/src/mage/cards/n/NecromancersCovenant.java +++ b/Mage.Sets/src/mage/cards/n/NecromancersCovenant.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.token.ZombieToken; import mage.players.Player; @@ -28,7 +27,7 @@ public final class NecromancersCovenant extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Zombies you control"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public NecromancersCovenant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NectarFaerie.java b/Mage.Sets/src/mage/cards/n/NectarFaerie.java index 3a049ef42a..9be3cff6d5 100644 --- a/Mage.Sets/src/mage/cards/n/NectarFaerie.java +++ b/Mage.Sets/src/mage/cards/n/NectarFaerie.java @@ -15,7 +15,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -27,7 +26,7 @@ public final class NectarFaerie extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Faerie or Elf"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.FAERIE),new SubtypePredicate(SubType.ELF))); + filter.add(Predicates.or(SubType.FAERIE.getPredicate(),SubType.ELF.getPredicate())); } public NectarFaerie(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NehebTheWorthy.java b/Mage.Sets/src/mage/cards/n/NehebTheWorthy.java index 6c37f1413a..c5d40b9d3e 100644 --- a/Mage.Sets/src/mage/cards/n/NehebTheWorthy.java +++ b/Mage.Sets/src/mage/cards/n/NehebTheWorthy.java @@ -17,7 +17,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -29,7 +28,7 @@ public final class NehebTheWorthy extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Minotaurs"); static { - filter.add(new SubtypePredicate(SubType.MINOTAUR)); + filter.add(SubType.MINOTAUR.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/n/NemataGroveGuardian.java b/Mage.Sets/src/mage/cards/n/NemataGroveGuardian.java index 94394505cb..e0f8efd781 100644 --- a/Mage.Sets/src/mage/cards/n/NemataGroveGuardian.java +++ b/Mage.Sets/src/mage/cards/n/NemataGroveGuardian.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SaprolingToken; import mage.target.common.TargetControlledPermanent; @@ -26,8 +25,8 @@ public final class NemataGroveGuardian extends CardImpl { private static final FilterControlledPermanent filter1 = new FilterControlledPermanent("Saproling"); static { - filter.add(new SubtypePredicate(SubType.SAPROLING)); - filter1.add(new SubtypePredicate(SubType.SAPROLING)); + filter.add(SubType.SAPROLING.getPredicate()); + filter1.add(SubType.SAPROLING.getPredicate()); } public NemataGroveGuardian(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NessianGameWarden.java b/Mage.Sets/src/mage/cards/n/NessianGameWarden.java index 4a44a2b6b7..8e7a89a625 100644 --- a/Mage.Sets/src/mage/cards/n/NessianGameWarden.java +++ b/Mage.Sets/src/mage/cards/n/NessianGameWarden.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -56,7 +55,7 @@ class NessianGameWardenEffect extends OneShotEffect { private static final FilterControlledPermanent filter = new FilterControlledPermanent("forests you control"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public NessianGameWardenEffect() { diff --git a/Mage.Sets/src/mage/cards/n/NettlingImp.java b/Mage.Sets/src/mage/cards/n/NettlingImp.java index c96717e753..99647d70b2 100644 --- a/Mage.Sets/src/mage/cards/n/NettlingImp.java +++ b/Mage.Sets/src/mage/cards/n/NettlingImp.java @@ -18,7 +18,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControlledFromStartOfControllerTurnPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; @@ -36,7 +35,7 @@ public final class NettlingImp extends CardImpl { static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Wall"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.WALL))); + filter.add(Predicates.not(SubType.WALL.getPredicate())); filter.add(new ControlledFromStartOfControllerTurnPredicate()); filter.add(new ControllerPredicate(TargetController.ACTIVE)); filter.setMessage("non-Wall creature the active player has controlled continuously since the beginning of the turn."); diff --git a/Mage.Sets/src/mage/cards/n/NezumiShadowWatcher.java b/Mage.Sets/src/mage/cards/n/NezumiShadowWatcher.java index 6eb15c7c20..4817247a95 100644 --- a/Mage.Sets/src/mage/cards/n/NezumiShadowWatcher.java +++ b/Mage.Sets/src/mage/cards/n/NezumiShadowWatcher.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -25,7 +24,7 @@ public final class NezumiShadowWatcher extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Ninja"); static { - filter.add(new SubtypePredicate(SubType.NINJA)); + filter.add(SubType.NINJA.getPredicate()); } public NezumiShadowWatcher(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NightfireGiant.java b/Mage.Sets/src/mage/cards/n/NightfireGiant.java index 5cb1c300af..1d089a6ab4 100644 --- a/Mage.Sets/src/mage/cards/n/NightfireGiant.java +++ b/Mage.Sets/src/mage/cards/n/NightfireGiant.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetAnyTarget; /** @@ -27,7 +26,7 @@ public final class NightfireGiant extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("a Mountain"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/n/Nightmare.java b/Mage.Sets/src/mage/cards/n/Nightmare.java index 355f446817..d7a68d24a8 100644 --- a/Mage.Sets/src/mage/cards/n/Nightmare.java +++ b/Mage.Sets/src/mage/cards/n/Nightmare.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -25,7 +24,7 @@ public final class Nightmare extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Swamps you control"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public Nightmare(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NightmareIncursion.java b/Mage.Sets/src/mage/cards/n/NightmareIncursion.java index f2af74211b..b103cd029e 100644 --- a/Mage.Sets/src/mage/cards/n/NightmareIncursion.java +++ b/Mage.Sets/src/mage/cards/n/NightmareIncursion.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.players.Player; @@ -53,7 +52,7 @@ class NightmareIncursionEffect extends OneShotEffect { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } boolean exiled = false; diff --git a/Mage.Sets/src/mage/cards/n/NightmareLash.java b/Mage.Sets/src/mage/cards/n/NightmareLash.java index b232dde2ca..d997dd523e 100644 --- a/Mage.Sets/src/mage/cards/n/NightmareLash.java +++ b/Mage.Sets/src/mage/cards/n/NightmareLash.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -22,7 +21,7 @@ public final class NightmareLash extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Swamp you control"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/n/NightpackAmbusher.java b/Mage.Sets/src/mage/cards/n/NightpackAmbusher.java index 7d11677780..07e39c3a25 100644 --- a/Mage.Sets/src/mage/cards/n/NightpackAmbusher.java +++ b/Mage.Sets/src/mage/cards/n/NightpackAmbusher.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.token.WolfToken; import mage.watchers.common.CastSpellLastTurnWatcher; @@ -34,8 +33,8 @@ public final class NightpackAmbusher extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.WEREWOLF), - new SubtypePredicate(SubType.WOLF) + SubType.WEREWOLF.getPredicate(), + SubType.WOLF.getPredicate() )); } diff --git a/Mage.Sets/src/mage/cards/n/NimbusMaze.java b/Mage.Sets/src/mage/cards/n/NimbusMaze.java index 6470b8f379..e0a5470f40 100644 --- a/Mage.Sets/src/mage/cards/n/NimbusMaze.java +++ b/Mage.Sets/src/mage/cards/n/NimbusMaze.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @author dustinconrad @@ -25,8 +24,8 @@ public final class NimbusMaze extends CardImpl { private static final FilterControlledPermanent controlPlains = new FilterControlledPermanent("you control a Plains"); static { - controlIsland.add(new SubtypePredicate(SubType.ISLAND)); - controlPlains.add(new SubtypePredicate(SubType.PLAINS)); + controlIsland.add(SubType.ISLAND.getPredicate()); + controlPlains.add(SubType.PLAINS.getPredicate()); } public NimbusMaze(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NineRingedBo.java b/Mage.Sets/src/mage/cards/n/NineRingedBo.java index 9143c3b045..97c7e0bcab 100644 --- a/Mage.Sets/src/mage/cards/n/NineRingedBo.java +++ b/Mage.Sets/src/mage/cards/n/NineRingedBo.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -25,7 +24,7 @@ public final class NineRingedBo extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("spirit"); static { - filter.add(new SubtypePredicate(SubType.SPIRIT)); + filter.add(SubType.SPIRIT.getPredicate()); } public NineRingedBo(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NirkanaRevenant.java b/Mage.Sets/src/mage/cards/n/NirkanaRevenant.java index 0e6177391a..86a5b7734f 100644 --- a/Mage.Sets/src/mage/cards/n/NirkanaRevenant.java +++ b/Mage.Sets/src/mage/cards/n/NirkanaRevenant.java @@ -16,7 +16,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -57,7 +56,7 @@ class NirkanaRevenantTriggeredAbility extends TriggeredManaAbility { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("Swamp"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public NirkanaRevenantTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/n/NissaRevane.java b/Mage.Sets/src/mage/cards/n/NissaRevane.java index 707127196e..ab912d5b14 100644 --- a/Mage.Sets/src/mage/cards/n/NissaRevane.java +++ b/Mage.Sets/src/mage/cards/n/NissaRevane.java @@ -16,7 +16,6 @@ import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; @@ -32,7 +31,7 @@ public final class NissaRevane extends CardImpl { static { nissasChosenFilter.add(new NamePredicate("Nissa's Chosen")); - elfFilter.add(new SubtypePredicate(SubType.ELF)); + elfFilter.add(SubType.ELF.getPredicate()); } public NissaRevane(UUID ownerId, CardSetInfo setInfo) { @@ -66,7 +65,7 @@ class NissaRevaneGainLifeEffect extends OneShotEffect { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public NissaRevaneGainLifeEffect() { diff --git a/Mage.Sets/src/mage/cards/n/NissaVastwoodSeer.java b/Mage.Sets/src/mage/cards/n/NissaVastwoodSeer.java index 4b4fd3b1a4..c3d64378a8 100644 --- a/Mage.Sets/src/mage/cards/n/NissaVastwoodSeer.java +++ b/Mage.Sets/src/mage/cards/n/NissaVastwoodSeer.java @@ -19,7 +19,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; @@ -32,7 +31,7 @@ public final class NissaVastwoodSeer extends CardImpl { private static final FilterCard filter = new FilterCard("basic Forest card"); static { filter.add(new SupertypePredicate(SuperType.BASIC)); - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public NissaVastwoodSeer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NissaWhoShakesTheWorld.java b/Mage.Sets/src/mage/cards/n/NissaWhoShakesTheWorld.java index b97dfb2056..cc891824f7 100644 --- a/Mage.Sets/src/mage/cards/n/NissaWhoShakesTheWorld.java +++ b/Mage.Sets/src/mage/cards/n/NissaWhoShakesTheWorld.java @@ -22,7 +22,6 @@ import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.command.emblems.NissaWhoShakesTheWorldEmblem; import mage.game.events.GameEvent; @@ -44,7 +43,7 @@ public final class NissaWhoShakesTheWorld extends CardImpl { static { filter.add(Predicates.not(CardType.CREATURE.getPredicate())); - filter2.add(new SubtypePredicate(SubType.FOREST)); + filter2.add(SubType.FOREST.getPredicate()); } public NissaWhoShakesTheWorld(UUID ownerId, CardSetInfo setInfo) { @@ -91,7 +90,7 @@ class NissaWhoShakesTheWorldTriggeredAbility extends TriggeredManaAbility { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("Forest"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } NissaWhoShakesTheWorldTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/n/NissasDefeat.java b/Mage.Sets/src/mage/cards/n/NissasDefeat.java index cd23db9ded..ca228c724b 100644 --- a/Mage.Sets/src/mage/cards/n/NissasDefeat.java +++ b/Mage.Sets/src/mage/cards/n/NissasDefeat.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -28,7 +27,7 @@ public final class NissasDefeat extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Forest, green enchantment, or green planeswalker"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.FOREST), + filter.add(Predicates.or(SubType.FOREST.getPredicate(), (Predicates.and(new ColorPredicate(ObjectColor.GREEN), CardType.ENCHANTMENT.getPredicate())), (Predicates.and(new ColorPredicate(ObjectColor.GREEN), CardType.PLANESWALKER.getPredicate())))); } @@ -57,7 +56,7 @@ class NissasDefeatEffect extends OneShotEffect { static { filter.add(CardType.PLANESWALKER.getPredicate()); - filter.add(new SubtypePredicate(SubType.NISSA)); + filter.add(SubType.NISSA.getPredicate()); } public NissasDefeatEffect() { diff --git a/Mage.Sets/src/mage/cards/n/NissasPilgrimage.java b/Mage.Sets/src/mage/cards/n/NissasPilgrimage.java index 14663db780..673fb5b1f5 100644 --- a/Mage.Sets/src/mage/cards/n/NissasPilgrimage.java +++ b/Mage.Sets/src/mage/cards/n/NissasPilgrimage.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.game.Game; import mage.players.Player; @@ -53,7 +52,7 @@ class NissasPilgrimageEffect extends OneShotEffect { static { filter.add(new SupertypePredicate(SuperType.BASIC)); - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public NissasPilgrimageEffect() { diff --git a/Mage.Sets/src/mage/cards/n/NissasTriumph.java b/Mage.Sets/src/mage/cards/n/NissasTriumph.java index 8d5a5ceb7f..9685b175eb 100644 --- a/Mage.Sets/src/mage/cards/n/NissasTriumph.java +++ b/Mage.Sets/src/mage/cards/n/NissasTriumph.java @@ -13,7 +13,6 @@ import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledPlaneswalkerPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; @@ -29,7 +28,7 @@ public final class NissasTriumph extends CardImpl { static { filter.add(new SupertypePredicate(SuperType.BASIC)); - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } private static final Condition condition = new PermanentsOnTheBattlefieldCondition(filter2); diff --git a/Mage.Sets/src/mage/cards/n/NoggleHedgeMage.java b/Mage.Sets/src/mage/cards/n/NoggleHedgeMage.java index c459491f62..46e6debed0 100644 --- a/Mage.Sets/src/mage/cards/n/NoggleHedgeMage.java +++ b/Mage.Sets/src/mage/cards/n/NoggleHedgeMage.java @@ -16,7 +16,6 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetPlayerOrPlaneswalker; @@ -31,8 +30,8 @@ public final class NoggleHedgeMage extends CardImpl { private static final FilterLandPermanent filter2 = new FilterLandPermanent(); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); - filter2.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.ISLAND.getPredicate()); + filter2.add(SubType.MOUNTAIN.getPredicate()); } private String rule = "When {this} enters the battlefield, if you control two or more Islands, you may tap two target permanents."; diff --git a/Mage.Sets/src/mage/cards/n/NomadMythmaker.java b/Mage.Sets/src/mage/cards/n/NomadMythmaker.java index 34a8f59dd8..a0f5d81b28 100644 --- a/Mage.Sets/src/mage/cards/n/NomadMythmaker.java +++ b/Mage.Sets/src/mage/cards/n/NomadMythmaker.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -34,7 +33,7 @@ public final class NomadMythmaker extends CardImpl { static { FILTER.add(CardType.ENCHANTMENT.getPredicate()); - FILTER.add(new SubtypePredicate(SubType.AURA)); + FILTER.add(SubType.AURA.getPredicate()); } public NomadMythmaker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/Norritt.java b/Mage.Sets/src/mage/cards/n/Norritt.java index d3f6339400..b5da637534 100644 --- a/Mage.Sets/src/mage/cards/n/Norritt.java +++ b/Mage.Sets/src/mage/cards/n/Norritt.java @@ -22,7 +22,6 @@ import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControlledFromStartOfControllerTurnPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; @@ -45,7 +44,7 @@ public final class Norritt extends CardImpl { private static final FilterCreaturePermanent filterCreature = new FilterCreaturePermanent("non-Wall creature"); static { - filterCreature.add(Predicates.not(new SubtypePredicate(SubType.WALL))); + filterCreature.add(Predicates.not(SubType.WALL.getPredicate())); filterCreature.add(new ControlledFromStartOfControllerTurnPredicate()); filterCreature.add(new ControllerPredicate(TargetController.ACTIVE)); filterCreature.setMessage("non-Wall creature the active player has controlled continuously since the beginning of the turn."); diff --git a/Mage.Sets/src/mage/cards/n/NoxiousGhoul.java b/Mage.Sets/src/mage/cards/n/NoxiousGhoul.java index bceb6def7c..c8bf3c0ffe 100644 --- a/Mage.Sets/src/mage/cards/n/NoxiousGhoul.java +++ b/Mage.Sets/src/mage/cards/n/NoxiousGhoul.java @@ -14,7 +14,6 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.ObjectSourcePlayer; import mage.filter.predicate.ObjectSourcePlayerPredicate; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -30,7 +29,7 @@ public final class NoxiousGhoul extends CardImpl { static { filter.add(CardType.CREATURE.getPredicate()); - filter.add(Predicates.not(new SubtypePredicate(SubType.ZOMBIE))); + filter.add(Predicates.not(SubType.ZOMBIE.getPredicate())); filter2.add(NoxiousGhoulPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/n/Nullify.java b/Mage.Sets/src/mage/cards/n/Nullify.java index 4eb438d6c3..9fb4a94e5e 100644 --- a/Mage.Sets/src/mage/cards/n/Nullify.java +++ b/Mage.Sets/src/mage/cards/n/Nullify.java @@ -9,7 +9,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetSpell; /** @@ -23,7 +22,7 @@ public final class Nullify extends CardImpl { static { filter.add(Predicates.or( CardType.CREATURE.getPredicate(), - new SubtypePredicate(SubType.AURA))); + SubType.AURA.getPredicate())); } public Nullify(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NutCollector.java b/Mage.Sets/src/mage/cards/n/NutCollector.java index 69a240a6cd..ac7c341753 100644 --- a/Mage.Sets/src/mage/cards/n/NutCollector.java +++ b/Mage.Sets/src/mage/cards/n/NutCollector.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SquirrelToken; /** @@ -26,7 +25,7 @@ public final class NutCollector extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("squirrel"); static { - filter.add(new SubtypePredicate(SubType.SQUIRREL)); + filter.add(SubType.SQUIRREL.getPredicate()); } public NutCollector(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OathkeeperTakenosDaisho.java b/Mage.Sets/src/mage/cards/o/OathkeeperTakenosDaisho.java index d5718d8eab..62d9545197 100644 --- a/Mage.Sets/src/mage/cards/o/OathkeeperTakenosDaisho.java +++ b/Mage.Sets/src/mage/cards/o/OathkeeperTakenosDaisho.java @@ -16,7 +16,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -30,7 +29,7 @@ public final class OathkeeperTakenosDaisho extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("it's a Samurai card"); static { - filter.add(new SubtypePredicate(SubType.SAMURAI)); + filter.add(SubType.SAMURAI.getPredicate()); } public OathkeeperTakenosDaisho(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/ObsidianBattleAxe.java b/Mage.Sets/src/mage/cards/o/ObsidianBattleAxe.java index 3888014128..b8546e621a 100644 --- a/Mage.Sets/src/mage/cards/o/ObsidianBattleAxe.java +++ b/Mage.Sets/src/mage/cards/o/ObsidianBattleAxe.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class ObsidianBattleAxe extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("a Warrior creature"); static { - filter.add(new SubtypePredicate(SubType.WARRIOR)); + filter.add(SubType.WARRIOR.getPredicate()); } public ObsidianBattleAxe(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OgreGeargrabber.java b/Mage.Sets/src/mage/cards/o/OgreGeargrabber.java index 95bed860cf..cbfd159c76 100644 --- a/Mage.Sets/src/mage/cards/o/OgreGeargrabber.java +++ b/Mage.Sets/src/mage/cards/o/OgreGeargrabber.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -30,7 +29,7 @@ public final class OgreGeargrabber extends CardImpl { static { filter.add(CardType.ARTIFACT.getPredicate()); - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); filter.add(new ControllerPredicate(TargetController.OPPONENT)); } diff --git a/Mage.Sets/src/mage/cards/o/OgreJailbreaker.java b/Mage.Sets/src/mage/cards/o/OgreJailbreaker.java index 54be74ca07..3d09d4ecf1 100644 --- a/Mage.Sets/src/mage/cards/o/OgreJailbreaker.java +++ b/Mage.Sets/src/mage/cards/o/OgreJailbreaker.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; /** @@ -51,7 +50,7 @@ class OgreJailbreakerEffect extends AsThoughEffectImpl { private static final FilterPermanent filter = new FilterPermanent(); private PermanentsOnTheBattlefieldCondition gateCondition; static { - filter.add(new SubtypePredicate(SubType.GATE)); + filter.add(SubType.GATE.getPredicate()); } public OgreJailbreakerEffect() { diff --git a/Mage.Sets/src/mage/cards/o/OgreSlumlord.java b/Mage.Sets/src/mage/cards/o/OgreSlumlord.java index 9c63fbc483..887080bbbf 100644 --- a/Mage.Sets/src/mage/cards/o/OgreSlumlord.java +++ b/Mage.Sets/src/mage/cards/o/OgreSlumlord.java @@ -17,7 +17,6 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.RatToken; @@ -33,7 +32,7 @@ public final class OgreSlumlord extends CardImpl { static { filter.add(Predicates.not(TokenPredicate.instance)); filter.add(AnotherPredicate.instance); - filter2.add(new SubtypePredicate(SubType.RAT)); + filter2.add(SubType.RAT.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/o/OjutaiSoulOfWinter.java b/Mage.Sets/src/mage/cards/o/OjutaiSoulOfWinter.java index ef3f845331..411894d536 100644 --- a/Mage.Sets/src/mage/cards/o/OjutaiSoulOfWinter.java +++ b/Mage.Sets/src/mage/cards/o/OjutaiSoulOfWinter.java @@ -15,7 +15,6 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; @@ -29,7 +28,7 @@ public final class OjutaiSoulOfWinter extends CardImpl { private static final FilterPermanent filterNonlandPermanent = new FilterNonlandPermanent("nonland permanent an opponent controls"); static { - filterDragon.add(new SubtypePredicate(SubType.DRAGON)); + filterDragon.add(SubType.DRAGON.getPredicate()); filterDragon.add(new ControllerPredicate(TargetController.YOU)); filterNonlandPermanent.add(new ControllerPredicate(TargetController.OPPONENT)); } diff --git a/Mage.Sets/src/mage/cards/o/OldFogey.java b/Mage.Sets/src/mage/cards/o/OldFogey.java index dabcf1537f..ba8f18c287 100644 --- a/Mage.Sets/src/mage/cards/o/OldFogey.java +++ b/Mage.Sets/src/mage/cards/o/OldFogey.java @@ -19,7 +19,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; /** @@ -32,9 +31,9 @@ public final class OldFogey extends CardImpl { private static final FilterLandPermanent filter2 = new FilterLandPermanent("snow-covered plains"); static { - filter.add(new SubtypePredicate(SubType.HOMARID)); + filter.add(SubType.HOMARID.getPredicate()); filter2.add(new SupertypePredicate(SuperType.SNOW)); - filter2.add(new SubtypePredicate(SubType.PLAINS)); + filter2.add(SubType.PLAINS.getPredicate()); } public OldFogey(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OliviaVoldaren.java b/Mage.Sets/src/mage/cards/o/OliviaVoldaren.java index c221c91dc2..6e835476ea 100644 --- a/Mage.Sets/src/mage/cards/o/OliviaVoldaren.java +++ b/Mage.Sets/src/mage/cards/o/OliviaVoldaren.java @@ -21,7 +21,6 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardIdPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -37,7 +36,7 @@ public final class OliviaVoldaren extends CardImpl { static { filter.add(AnotherPredicate.instance); - vampireFilter.add(new SubtypePredicate(SubType.VAMPIRE)); + vampireFilter.add(SubType.VAMPIRE.getPredicate()); } public OliviaVoldaren(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OliviasBloodsworn.java b/Mage.Sets/src/mage/cards/o/OliviasBloodsworn.java index 0bccc2c4fe..f3a605f7ca 100644 --- a/Mage.Sets/src/mage/cards/o/OliviasBloodsworn.java +++ b/Mage.Sets/src/mage/cards/o/OliviasBloodsworn.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -29,7 +28,7 @@ public final class OliviasBloodsworn extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Vampire"); static { - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); } public OliviasBloodsworn(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OmenOfFire.java b/Mage.Sets/src/mage/cards/o/OmenOfFire.java index bdc460f415..335b64ec9b 100644 --- a/Mage.Sets/src/mage/cards/o/OmenOfFire.java +++ b/Mage.Sets/src/mage/cards/o/OmenOfFire.java @@ -16,7 +16,6 @@ import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.targetpointer.FixedTarget; @@ -29,7 +28,7 @@ public final class OmenOfFire extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Islands"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } public OmenOfFire(UUID ownerId, CardSetInfo setInfo) { @@ -57,7 +56,7 @@ class OmenOfFireEffect extends OneShotEffect { private static final FilterPermanent filterWhite1 = new FilterPermanent("Plains or white permanent"); static { filterWhite1.add(Predicates.or( - new SubtypePredicate(SubType.PLAINS), + SubType.PLAINS.getPredicate(), new ColorPredicate(ObjectColor.WHITE))); } diff --git a/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java b/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java index 835653426f..d0cefaf7be 100644 --- a/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java +++ b/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.OmnathElementalToken; import mage.target.common.TargetAnyTarget; @@ -29,7 +28,7 @@ public final class OmnathLocusOfRage extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Elemental you control"); static { - filter.add(new SubtypePredicate(SubType.ELEMENTAL)); + filter.add(SubType.ELEMENTAL.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/o/OnduCleric.java b/Mage.Sets/src/mage/cards/o/OnduCleric.java index 308e4226a1..5774cd6763 100644 --- a/Mage.Sets/src/mage/cards/o/OnduCleric.java +++ b/Mage.Sets/src/mage/cards/o/OnduCleric.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -24,7 +23,7 @@ public final class OnduCleric extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Allies you control"); static { - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/o/OnduWarCleric.java b/Mage.Sets/src/mage/cards/o/OnduWarCleric.java index 8ca40e0e6c..535e211cfa 100644 --- a/Mage.Sets/src/mage/cards/o/OnduWarCleric.java +++ b/Mage.Sets/src/mage/cards/o/OnduWarCleric.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -29,7 +28,7 @@ public final class OnduWarCleric extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("an untapped Ally you control"); static { - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/o/OozeGarden.java b/Mage.Sets/src/mage/cards/o/OozeGarden.java index ec4d5c9721..be0b453288 100644 --- a/Mage.Sets/src/mage/cards/o/OozeGarden.java +++ b/Mage.Sets/src/mage/cards/o/OozeGarden.java @@ -5,9 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.ObjectColor; -import mage.abilities.AbilitiesImpl; import mage.abilities.Ability; -import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.ActivateAsSorceryActivatedAbility; import mage.abilities.costs.Cost; import mage.abilities.costs.common.SacrificeTargetCost; @@ -21,12 +19,10 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.token.TokenImpl; import mage.game.permanent.token.Token; import mage.target.common.TargetControlledCreaturePermanent; -import mage.util.SubTypeList; /** * @@ -36,7 +32,7 @@ public final class OozeGarden extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("non-Ooze creature"); static{ - filter.add(Predicates.not(new SubtypePredicate(SubType.OOZE))); + filter.add(Predicates.not(SubType.OOZE.getPredicate())); } public OozeGarden(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{G}"); diff --git a/Mage.Sets/src/mage/cards/o/OpalLakeGatekeepers.java b/Mage.Sets/src/mage/cards/o/OpalLakeGatekeepers.java index 4d57054223..713622aca9 100644 --- a/Mage.Sets/src/mage/cards/o/OpalLakeGatekeepers.java +++ b/Mage.Sets/src/mage/cards/o/OpalLakeGatekeepers.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -27,7 +26,7 @@ public final class OpalLakeGatekeepers extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent(); static { - filter.add(new SubtypePredicate(SubType.GATE)); + filter.add(SubType.GATE.getPredicate()); } private static final Condition gatesCondition = new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 1); diff --git a/Mage.Sets/src/mage/cards/o/Opalescence.java b/Mage.Sets/src/mage/cards/o/Opalescence.java index 40319bcfcd..d011267f36 100644 --- a/Mage.Sets/src/mage/cards/o/Opalescence.java +++ b/Mage.Sets/src/mage/cards/o/Opalescence.java @@ -15,7 +15,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -51,7 +50,7 @@ class OpalescenceEffect extends ContinuousEffectImpl { private static final EnumSet checkDependencyTypes; static { - filter.add(Predicates.not(new SubtypePredicate(SubType.AURA))); + filter.add(Predicates.not(SubType.AURA.getPredicate())); filter.add(AnotherPredicate.instance); checkDependencyTypes = EnumSet.of(DependencyType.AuraAddingRemoving, DependencyType.EnchantmentAddingRemoving); } diff --git a/Mage.Sets/src/mage/cards/o/OpalineSliver.java b/Mage.Sets/src/mage/cards/o/OpalineSliver.java index df44ebd6be..81239a3e23 100644 --- a/Mage.Sets/src/mage/cards/o/OpalineSliver.java +++ b/Mage.Sets/src/mage/cards/o/OpalineSliver.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -30,7 +29,7 @@ public final class OpalineSliver extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("All Slivers"); static { - filter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); } public OpalineSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OpenTheArmory.java b/Mage.Sets/src/mage/cards/o/OpenTheArmory.java index 8e04b2959c..3cfceb6596 100644 --- a/Mage.Sets/src/mage/cards/o/OpenTheArmory.java +++ b/Mage.Sets/src/mage/cards/o/OpenTheArmory.java @@ -7,7 +7,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; import java.util.UUID; @@ -21,8 +20,8 @@ public final class OpenTheArmory extends CardImpl { static { auraOrEquipmentTarget.add(Predicates.or( - new SubtypePredicate(SubType.EQUIPMENT), - new SubtypePredicate(SubType.AURA))); + SubType.EQUIPMENT.getPredicate(), + SubType.AURA.getPredicate())); } public OpenTheArmory(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OpenTheGates.java b/Mage.Sets/src/mage/cards/o/OpenTheGates.java index 91aa07c3e3..1ba59961b1 100644 --- a/Mage.Sets/src/mage/cards/o/OpenTheGates.java +++ b/Mage.Sets/src/mage/cards/o/OpenTheGates.java @@ -8,7 +8,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; @@ -26,7 +25,7 @@ public final class OpenTheGates extends CardImpl { Predicates.and( new SupertypePredicate(SuperType.BASIC), CardType.LAND.getPredicate() - ), new SubtypePredicate(SubType.GATE) + ), SubType.GATE.getPredicate() )); } diff --git a/Mage.Sets/src/mage/cards/o/OpportunisticDragon.java b/Mage.Sets/src/mage/cards/o/OpportunisticDragon.java index 3876c45e41..dc5fe27435 100644 --- a/Mage.Sets/src/mage/cards/o/OpportunisticDragon.java +++ b/Mage.Sets/src/mage/cards/o/OpportunisticDragon.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -32,7 +31,7 @@ public final class OpportunisticDragon extends CardImpl { static { filter.add(Predicates.or( CardType.ARTIFACT.getPredicate(), - new SubtypePredicate(SubType.HUMAN) + SubType.HUMAN.getPredicate() )); filter.add(new ControllerPredicate(TargetController.OPPONENT)); } diff --git a/Mage.Sets/src/mage/cards/o/OratorOfOjutai.java b/Mage.Sets/src/mage/cards/o/OratorOfOjutai.java index ddddb16971..b11340a527 100644 --- a/Mage.Sets/src/mage/cards/o/OratorOfOjutai.java +++ b/Mage.Sets/src/mage/cards/o/OratorOfOjutai.java @@ -16,7 +16,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -33,7 +32,7 @@ public final class OratorOfOjutai extends CardImpl { private static final FilterCard filter = new FilterCard("a Dragon card from your hand (you don't have to)"); static { - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } public OratorOfOjutai(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OrbitalBombardment.java b/Mage.Sets/src/mage/cards/o/OrbitalBombardment.java index 47631d8f64..36e1b8e63e 100644 --- a/Mage.Sets/src/mage/cards/o/OrbitalBombardment.java +++ b/Mage.Sets/src/mage/cards/o/OrbitalBombardment.java @@ -9,7 +9,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -20,7 +19,7 @@ public final class OrbitalBombardment extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Starship creatures"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.STARSHIP))); + filter.add(Predicates.not(SubType.STARSHIP.getPredicate())); } public OrbitalBombardment(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OrcGeneral.java b/Mage.Sets/src/mage/cards/o/OrcGeneral.java index 792b222f8a..49d0599125 100644 --- a/Mage.Sets/src/mage/cards/o/OrcGeneral.java +++ b/Mage.Sets/src/mage/cards/o/OrcGeneral.java @@ -17,7 +17,6 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetControlledPermanent; @@ -31,10 +30,10 @@ public final class OrcGeneral extends CardImpl { private static final FilterCreaturePermanent filterOrc = new FilterCreaturePermanent("Other Orc creatures"); static { - filterOrcOrGoblin.add(Predicates.or(new SubtypePredicate(SubType.ORC), - new SubtypePredicate(SubType.GOBLIN))); + filterOrcOrGoblin.add(Predicates.or(SubType.ORC.getPredicate(), + SubType.GOBLIN.getPredicate())); filterOrcOrGoblin.add(AnotherPredicate.instance); - filterOrc.add(new SubtypePredicate(SubType.ORC)); + filterOrc.add(SubType.ORC.getPredicate()); } public OrcGeneral(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OrchardWarden.java b/Mage.Sets/src/mage/cards/o/OrchardWarden.java index cd77dd9b47..4888f45153 100644 --- a/Mage.Sets/src/mage/cards/o/OrchardWarden.java +++ b/Mage.Sets/src/mage/cards/o/OrchardWarden.java @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -25,7 +24,7 @@ public final class OrchardWarden extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another Treefolk creature"); static { - filter.add(new SubtypePredicate(SubType.TREEFOLK)); + filter.add(SubType.TREEFOLK.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/o/OrcishCaptain.java b/Mage.Sets/src/mage/cards/o/OrcishCaptain.java index adb3772355..540d28fbac 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishCaptain.java +++ b/Mage.Sets/src/mage/cards/o/OrcishCaptain.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -27,7 +26,7 @@ public final class OrcishCaptain extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Orc creature"); static { - filter.add(new SubtypePredicate(SubType.ORC)); + filter.add(SubType.ORC.getPredicate()); } public OrcishCaptain(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OrcishLumberjack.java b/Mage.Sets/src/mage/cards/o/OrcishLumberjack.java index 8cbd5b2869..ba74701e97 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishLumberjack.java +++ b/Mage.Sets/src/mage/cards/o/OrcishLumberjack.java @@ -21,7 +21,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetControlledPermanent; @@ -35,7 +34,7 @@ public final class OrcishLumberjack extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Forest"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public OrcishLumberjack(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OreskosExplorer.java b/Mage.Sets/src/mage/cards/o/OreskosExplorer.java index 8325374b9c..169e7a7879 100644 --- a/Mage.Sets/src/mage/cards/o/OreskosExplorer.java +++ b/Mage.Sets/src/mage/cards/o/OreskosExplorer.java @@ -14,7 +14,6 @@ import mage.cards.CardsImpl; import mage.constants.*; import mage.filter.common.FilterLandCard; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.players.Player; @@ -85,7 +84,7 @@ class OreskosExplorerEffect extends OneShotEffect { if (landsToSearch > 0) { FilterLandCard filterPlains = new FilterLandCard("up to " + landsToSearch + " Plains cards"); filterPlains.add(new ControllerPredicate(TargetController.YOU)); - filterPlains.add(new SubtypePredicate(SubType.PLAINS)); + filterPlains.add(SubType.PLAINS.getPredicate()); TargetCardInLibrary target = new TargetCardInLibrary(0, landsToSearch, filterPlains); if (controller.searchLibrary(target, source, game)) { Cards cards = new CardsImpl(target.getTargets()); diff --git a/Mage.Sets/src/mage/cards/o/OrimsCure.java b/Mage.Sets/src/mage/cards/o/OrimsCure.java index d7b5614896..4e8b769ad6 100644 --- a/Mage.Sets/src/mage/cards/o/OrimsCure.java +++ b/Mage.Sets/src/mage/cards/o/OrimsCure.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetAnyTarget; @@ -30,7 +29,7 @@ public final class OrimsCure extends CardImpl { private static final FilterControlledCreaturePermanent filterCreature = new FilterControlledCreaturePermanent("untapped creature you control"); static { - filter.add(new SubtypePredicate(SubType.PLAINS)); + filter.add(SubType.PLAINS.getPredicate()); filterCreature.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/o/OtarianJuggernaut.java b/Mage.Sets/src/mage/cards/o/OtarianJuggernaut.java index 39369dff34..81c761de2c 100644 --- a/Mage.Sets/src/mage/cards/o/OtarianJuggernaut.java +++ b/Mage.Sets/src/mage/cards/o/OtarianJuggernaut.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -26,7 +25,7 @@ public final class OtarianJuggernaut extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Walls"); static { - filter.add(new SubtypePredicate(SubType.WALL)); + filter.add(SubType.WALL.getPredicate()); } public OtarianJuggernaut(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OtepecHuntmaster.java b/Mage.Sets/src/mage/cards/o/OtepecHuntmaster.java index dc119e8b4d..99734bec20 100644 --- a/Mage.Sets/src/mage/cards/o/OtepecHuntmaster.java +++ b/Mage.Sets/src/mage/cards/o/OtepecHuntmaster.java @@ -18,7 +18,6 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -31,8 +30,8 @@ public final class OtepecHuntmaster extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("Dinosaur"); static { - filter.add(new SubtypePredicate(SubType.DINOSAUR)); - filter2.add(new SubtypePredicate(SubType.DINOSAUR)); + filter.add(SubType.DINOSAUR.getPredicate()); + filter2.add(SubType.DINOSAUR.getPredicate()); } public OtepecHuntmaster(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/Outbreak.java b/Mage.Sets/src/mage/cards/o/Outbreak.java index f729b5487c..6d5642d117 100644 --- a/Mage.Sets/src/mage/cards/o/Outbreak.java +++ b/Mage.Sets/src/mage/cards/o/Outbreak.java @@ -18,7 +18,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInHand; @@ -31,7 +30,7 @@ public final class Outbreak extends CardImpl { private static final FilterCard filterLand = new FilterCard("a Swamp card"); static { - filterLand.add(new SubtypePredicate(SubType.SWAMP)); + filterLand.add(SubType.SWAMP.getPredicate()); } public Outbreak(UUID ownerId, CardSetInfo setInfo) { @@ -72,7 +71,7 @@ class OutbreakEffect extends OneShotEffect { if (player != null && player.choose(outcome, typeChoice, game)) { game.informPlayers(player.getLogName() + " has chosen " + typeChoice.getChoice()); FilterCreaturePermanent filter = new FilterCreaturePermanent("All creatures of the chosen type"); - filter.add(new SubtypePredicate(SubType.byDescription(typeChoice.getChoice()))); + filter.add(SubType.byDescription(typeChoice.getChoice()).getPredicate()); ContinuousEffect effect = new BoostAllEffect(-1, -1, Duration.WhileOnBattlefield, filter, false); game.addEffect(effect, source); return true; diff --git a/Mage.Sets/src/mage/cards/p/PackRat.java b/Mage.Sets/src/mage/cards/p/PackRat.java index 6fbc67d2f3..8a9f1e76f0 100644 --- a/Mage.Sets/src/mage/cards/p/PackRat.java +++ b/Mage.Sets/src/mage/cards/p/PackRat.java @@ -18,7 +18,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -44,7 +43,7 @@ public final class PackRat extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Rats you control"); static { - filter.add(new SubtypePredicate(SubType.RAT)); + filter.add(SubType.RAT.getPredicate()); } public PackRat(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PacksDisdain.java b/Mage.Sets/src/mage/cards/p/PacksDisdain.java index 332c7d8c64..930e6c75e8 100644 --- a/Mage.Sets/src/mage/cards/p/PacksDisdain.java +++ b/Mage.Sets/src/mage/cards/p/PacksDisdain.java @@ -1,7 +1,6 @@ package mage.cards.p; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -17,14 +16,14 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** - * * @author fenhl */ public final class PacksDisdain extends CardImpl { @@ -69,7 +68,7 @@ class PacksDisdainEffect extends OneShotEffect { Choice typeChoice = new ChoiceCreatureType(game.getObject(source.getSourceId())); if (player != null && player.choose(Outcome.UnboostCreature, typeChoice, game)) { FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); - filter.add(new SubtypePredicate(SubType.byDescription(typeChoice.getChoice()))); + filter.add(SubType.byDescription(typeChoice.getChoice()).getPredicate()); DynamicValue negativePermanentsCount = new PermanentsOnBattlefieldCount(filter, -1); ContinuousEffect effect = new BoostTargetEffect(negativePermanentsCount, negativePermanentsCount, Duration.EndOfTurn, true); effect.setTargetPointer(new FixedTarget(source.getFirstTarget())); diff --git a/Mage.Sets/src/mage/cards/p/PallidMycoderm.java b/Mage.Sets/src/mage/cards/p/PallidMycoderm.java index 349376769f..9fd681bc8a 100644 --- a/Mage.Sets/src/mage/cards/p/PallidMycoderm.java +++ b/Mage.Sets/src/mage/cards/p/PallidMycoderm.java @@ -17,7 +17,6 @@ import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.SaprolingToken; import mage.target.common.TargetControlledCreaturePermanent; @@ -32,8 +31,8 @@ public final class PallidMycoderm extends CardImpl { private static final FilterControlledCreaturePermanent filterSaproling = new FilterControlledCreaturePermanent("a Saproling"); static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(Predicates.or(new SubtypePredicate(SubType.FUNGUS), new SubtypePredicate(SubType.SAPROLING))); - filterSaproling.add(new SubtypePredicate(SubType.SAPROLING)); + filter.add(Predicates.or(SubType.FUNGUS.getPredicate(), SubType.SAPROLING.getPredicate())); + filterSaproling.add(SubType.SAPROLING.getPredicate()); } public PallidMycoderm(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PatriarchsBidding.java b/Mage.Sets/src/mage/cards/p/PatriarchsBidding.java index bf61c7675f..8625532123 100644 --- a/Mage.Sets/src/mage/cards/p/PatriarchsBidding.java +++ b/Mage.Sets/src/mage/cards/p/PatriarchsBidding.java @@ -16,7 +16,6 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; @@ -75,9 +74,9 @@ class PatriarchsBiddingEffect extends OneShotEffect { chosenTypes.add(chosenType); } - List predicates = new ArrayList<>(); + List predicates = new ArrayList<>(); for (String type : chosenTypes) { - predicates.add(new SubtypePredicate(SubType.byDescription(type))); + predicates.add(SubType.byDescription(type).getPredicate()); } FilterCard filter = new FilterCreatureCard(); filter.add(Predicates.or(predicates)); diff --git a/Mage.Sets/src/mage/cards/p/PatronOfTheOrochi.java b/Mage.Sets/src/mage/cards/p/PatronOfTheOrochi.java index 1d47d5a966..d874b55b6c 100644 --- a/Mage.Sets/src/mage/cards/p/PatronOfTheOrochi.java +++ b/Mage.Sets/src/mage/cards/p/PatronOfTheOrochi.java @@ -15,7 +15,6 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -56,7 +55,7 @@ class PatronOfTheOrochiEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterPermanent(); static { - filter.add(Predicates.or( new SubtypePredicate(SubType.FOREST), + filter.add(Predicates.or( SubType.FOREST.getPredicate(), Predicates.and(CardType.CREATURE.getPredicate(), new ColorPredicate(ObjectColor.GREEN)) )); diff --git a/Mage.Sets/src/mage/cards/p/PatronOfTheVein.java b/Mage.Sets/src/mage/cards/p/PatronOfTheVein.java index 2e21f6d8c8..768afc53a4 100644 --- a/Mage.Sets/src/mage/cards/p/PatronOfTheVein.java +++ b/Mage.Sets/src/mage/cards/p/PatronOfTheVein.java @@ -23,7 +23,6 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent.EventType; @@ -124,7 +123,7 @@ class PatronOfTheVeinExileCreatureEffect extends OneShotEffect { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); static { - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); } public PatronOfTheVeinExileCreatureEffect() { diff --git a/Mage.Sets/src/mage/cards/p/PatronWizard.java b/Mage.Sets/src/mage/cards/p/PatronWizard.java index 2e447eb094..54f7672b00 100644 --- a/Mage.Sets/src/mage/cards/p/PatronWizard.java +++ b/Mage.Sets/src/mage/cards/p/PatronWizard.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetSpell; import mage.target.common.TargetControlledPermanent; @@ -29,7 +28,7 @@ public final class PatronWizard extends CardImpl { static final private FilterControlledPermanent filter = new FilterControlledPermanent("untapped Wizard you control"); static { - filter.add(new SubtypePredicate(SubType.WIZARD)); + filter.add(SubType.WIZARD.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/p/PeacewalkerColossus.java b/Mage.Sets/src/mage/cards/p/PeacewalkerColossus.java index 6792fca6da..c3d89af4bc 100644 --- a/Mage.Sets/src/mage/cards/p/PeacewalkerColossus.java +++ b/Mage.Sets/src/mage/cards/p/PeacewalkerColossus.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledArtifactPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetControlledPermanent; @@ -30,7 +29,7 @@ public final class PeacewalkerColossus extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new SubtypePredicate(SubType.VEHICLE)); + filter.add(SubType.VEHICLE.getPredicate()); } public PeacewalkerColossus(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PeakEruption.java b/Mage.Sets/src/mage/cards/p/PeakEruption.java index 83f3dc71df..af312888cd 100644 --- a/Mage.Sets/src/mage/cards/p/PeakEruption.java +++ b/Mage.Sets/src/mage/cards/p/PeakEruption.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetLandPermanent; /** @@ -22,7 +21,7 @@ public final class PeakEruption extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Mountain"); static{ - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public PeakEruption(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PearlspearCourier.java b/Mage.Sets/src/mage/cards/p/PearlspearCourier.java index 666215b9b1..8d0520a6bc 100644 --- a/Mage.Sets/src/mage/cards/p/PearlspearCourier.java +++ b/Mage.Sets/src/mage/cards/p/PearlspearCourier.java @@ -20,7 +20,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -32,7 +31,7 @@ public final class PearlspearCourier extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Soldier creature"); static { - filter.add(new SubtypePredicate(SubType.SOLDIER)); + filter.add(SubType.SOLDIER.getPredicate()); } public PearlspearCourier(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/Pentavus.java b/Mage.Sets/src/mage/cards/p/Pentavus.java index ff017b2bec..f40c46b9ae 100644 --- a/Mage.Sets/src/mage/cards/p/Pentavus.java +++ b/Mage.Sets/src/mage/cards/p/Pentavus.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.PentaviteToken; import mage.target.common.TargetControlledPermanent; @@ -31,7 +30,7 @@ public final class Pentavus extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Pentavite"); static { - filter.add(new SubtypePredicate(SubType.PENTAVITE)); + filter.add(SubType.PENTAVITE.getPredicate()); } public Pentavus(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PeopleOfTheWoods.java b/Mage.Sets/src/mage/cards/p/PeopleOfTheWoods.java index 3987f7b24e..a54ee0d317 100644 --- a/Mage.Sets/src/mage/cards/p/PeopleOfTheWoods.java +++ b/Mage.Sets/src/mage/cards/p/PeopleOfTheWoods.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class PeopleOfTheWoods extends CardImpl { static final FilterControlledPermanent filterLands = new FilterControlledPermanent("Forests you control"); static { - filterLands.add(new SubtypePredicate(SubType.FOREST)); + filterLands.add(SubType.FOREST.getPredicate()); } public PeopleOfTheWoods(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/Peppersmoke.java b/Mage.Sets/src/mage/cards/p/Peppersmoke.java index 17fc181220..efe8489db3 100644 --- a/Mage.Sets/src/mage/cards/p/Peppersmoke.java +++ b/Mage.Sets/src/mage/cards/p/Peppersmoke.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -24,7 +23,7 @@ public final class Peppersmoke extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("If you control a Faerie,"); static { - filter.add(new SubtypePredicate(SubType.FAERIE)); + filter.add(SubType.FAERIE.getPredicate()); } public Peppersmoke(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PerilousForays.java b/Mage.Sets/src/mage/cards/p/PerilousForays.java index 8ec503f870..7e6ea8dab8 100644 --- a/Mage.Sets/src/mage/cards/p/PerilousForays.java +++ b/Mage.Sets/src/mage/cards/p/PerilousForays.java @@ -16,7 +16,6 @@ import mage.constants.Zone; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.filter.common.FilterLandCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledCreaturePermanent; @@ -30,11 +29,11 @@ public final class PerilousForays extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.PLAINS), - new SubtypePredicate(SubType.ISLAND), - new SubtypePredicate(SubType.SWAMP), - new SubtypePredicate(SubType.FOREST), - new SubtypePredicate(SubType.MOUNTAIN))); + SubType.PLAINS.getPredicate(), + SubType.ISLAND.getPredicate(), + SubType.SWAMP.getPredicate(), + SubType.FOREST.getPredicate(), + SubType.MOUNTAIN.getPredicate())); } public PerilousForays(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PersistentPetitioners.java b/Mage.Sets/src/mage/cards/p/PersistentPetitioners.java index d3548d6bee..91861e50a0 100644 --- a/Mage.Sets/src/mage/cards/p/PersistentPetitioners.java +++ b/Mage.Sets/src/mage/cards/p/PersistentPetitioners.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; @@ -31,7 +30,7 @@ public final class PersistentPetitioners extends CardImpl { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new SubtypePredicate(SubType.ADVISOR)); + filter.add(SubType.ADVISOR.getPredicate()); } public PersistentPetitioners(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PestilenceRats.java b/Mage.Sets/src/mage/cards/p/PestilenceRats.java index bbf9acf52d..86799253f2 100644 --- a/Mage.Sets/src/mage/cards/p/PestilenceRats.java +++ b/Mage.Sets/src/mage/cards/p/PestilenceRats.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.AnotherCardPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class PestilenceRats extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("other Rats on the battlefield"); static{ - filter.add(new SubtypePredicate(SubType.RAT)); + filter.add(SubType.RAT.getPredicate()); filter.add(new AnotherCardPredicate()); } diff --git a/Mage.Sets/src/mage/cards/p/PharikasSpawn.java b/Mage.Sets/src/mage/cards/p/PharikasSpawn.java index e1b78fc915..84e0e29429 100644 --- a/Mage.Sets/src/mage/cards/p/PharikasSpawn.java +++ b/Mage.Sets/src/mage/cards/p/PharikasSpawn.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -53,7 +52,7 @@ class PharikasSpawnDelayedTriggeredAbility extends DelayedTriggeredAbility { private static final FilterPermanent filter = new FilterCreaturePermanent("a non-Gorgon creature"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.GORGON))); + filter.add(Predicates.not(SubType.GORGON.getPredicate())); } PharikasSpawnDelayedTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/p/PheresBandWarchief.java b/Mage.Sets/src/mage/cards/p/PheresBandWarchief.java index ce9c9ee139..045b5920ea 100644 --- a/Mage.Sets/src/mage/cards/p/PheresBandWarchief.java +++ b/Mage.Sets/src/mage/cards/p/PheresBandWarchief.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -26,7 +25,7 @@ public final class PheresBandWarchief extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Other Centaur creatures you control"); static { - filter.add(new SubtypePredicate(SubType.CENTAUR)); + filter.add(SubType.CENTAUR.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianDriver.java b/Mage.Sets/src/mage/cards/p/PhyrexianDriver.java index e321fac096..b00d28fdf2 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianDriver.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianDriver.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @author Backfir3 @@ -21,7 +20,7 @@ public final class PhyrexianDriver extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Mercenary creatures"); static { - filter.add(new SubtypePredicate(SubType.MERCENARY)); + filter.add(SubType.MERCENARY.getPredicate()); } public PhyrexianDriver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PietyCharm.java b/Mage.Sets/src/mage/cards/p/PietyCharm.java index 157fcab437..638a0db975 100644 --- a/Mage.Sets/src/mage/cards/p/PietyCharm.java +++ b/Mage.Sets/src/mage/cards/p/PietyCharm.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AttachedToPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -30,9 +29,9 @@ public final class PietyCharm extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("Soldier creature"); static { - filter1.add(new SubtypePredicate(SubType.AURA)); + filter1.add(SubType.AURA.getPredicate()); filter1.add(new AttachedToPredicate(new FilterCreaturePermanent())); - filter2.add(new SubtypePredicate(SubType.SOLDIER)); + filter2.add(SubType.SOLDIER.getPredicate()); } public PietyCharm(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PiratesCutlass.java b/Mage.Sets/src/mage/cards/p/PiratesCutlass.java index bceb16343a..01500f9019 100644 --- a/Mage.Sets/src/mage/cards/p/PiratesCutlass.java +++ b/Mage.Sets/src/mage/cards/p/PiratesCutlass.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -30,7 +29,7 @@ public final class PiratesCutlass extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Pirate you control"); static { - filter.add(new SubtypePredicate(SubType.PIRATE)); + filter.add(SubType.PIRATE.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/p/PlagueBelcher.java b/Mage.Sets/src/mage/cards/p/PlagueBelcher.java index 65ef7f718d..edd51cfe31 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueBelcher.java +++ b/Mage.Sets/src/mage/cards/p/PlagueBelcher.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -31,7 +30,7 @@ public final class PlagueBelcher extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/p/PlagueSliver.java b/Mage.Sets/src/mage/cards/p/PlagueSliver.java index 3ece241188..2076b13a4f 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueSliver.java +++ b/Mage.Sets/src/mage/cards/p/PlagueSliver.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -23,7 +22,7 @@ public final class PlagueSliver extends CardImpl { private static final FilterCreaturePermanent filterSliver = new FilterCreaturePermanent(); static { - filterSliver.add(new SubtypePredicate(SubType.SLIVER)); + filterSliver.add(SubType.SLIVER.getPredicate()); } public PlagueSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PlanarOverlay.java b/Mage.Sets/src/mage/cards/p/PlanarOverlay.java index ced5f87121..8a0245f120 100644 --- a/Mage.Sets/src/mage/cards/p/PlanarOverlay.java +++ b/Mage.Sets/src/mage/cards/p/PlanarOverlay.java @@ -7,7 +7,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.players.Player; @@ -66,7 +65,7 @@ class PlanarOverlayEffect extends OneShotEffect { if (player != null) { for (SubType landName : SubType.getBasicLands()) { FilterLandPermanent filter = new FilterLandPermanent(landName + " to return to hand"); - filter.add(new SubtypePredicate(landName)); + filter.add(landName.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); Target target = new TargetLandPermanent(1, 1, filter, true); if (target.canChoose(source.getSourceId(), player.getId(), game)) { diff --git a/Mage.Sets/src/mage/cards/p/PlantElemental.java b/Mage.Sets/src/mage/cards/p/PlantElemental.java index 73c6508f03..9711f2e8c3 100644 --- a/Mage.Sets/src/mage/cards/p/PlantElemental.java +++ b/Mage.Sets/src/mage/cards/p/PlantElemental.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -23,7 +22,7 @@ public final class PlantElemental extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("a Forest"); static{ - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public PlantElemental(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PlazaOfHarmony.java b/Mage.Sets/src/mage/cards/p/PlazaOfHarmony.java index 4a452918e6..479d6b7393 100644 --- a/Mage.Sets/src/mage/cards/p/PlazaOfHarmony.java +++ b/Mage.Sets/src/mage/cards/p/PlazaOfHarmony.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -29,7 +28,7 @@ public final class PlazaOfHarmony extends CardImpl { private static final FilterPermanent filter2 = new FilterPermanent(SubType.GATE, "Gate"); static { - filter.add(new SubtypePredicate(SubType.GATE)); + filter.add(SubType.GATE.getPredicate()); } private static final Condition condition diff --git a/Mage.Sets/src/mage/cards/p/PoeDameron.java b/Mage.Sets/src/mage/cards/p/PoeDameron.java index a85a74dd10..9637e1753c 100644 --- a/Mage.Sets/src/mage/cards/p/PoeDameron.java +++ b/Mage.Sets/src/mage/cards/p/PoeDameron.java @@ -9,8 +9,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; @@ -27,7 +25,7 @@ public final class PoeDameron extends CardImpl { filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(Predicates.not(TokenPredicate.instance)); filterStarship.add(new ControllerPredicate(TargetController.YOU)); - filterStarship.add(new SubtypePredicate(SubType.STARSHIP)); + filterStarship.add(SubType.STARSHIP.getPredicate()); } public PoeDameron(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PortTown.java b/Mage.Sets/src/mage/cards/p/PortTown.java index 9b7f011705..ce4e2acad0 100644 --- a/Mage.Sets/src/mage/cards/p/PortTown.java +++ b/Mage.Sets/src/mage/cards/p/PortTown.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; /** @@ -25,8 +24,8 @@ public final class PortTown extends CardImpl { private static final FilterCard filter = new FilterCard("a Plains or Island card from your hand"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.PLAINS), - new SubtypePredicate(SubType.ISLAND))); + filter.add(Predicates.or(SubType.PLAINS.getPredicate(), + SubType.ISLAND.getPredicate())); } public PortTown(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PraetorianTrooper.java b/Mage.Sets/src/mage/cards/p/PraetorianTrooper.java index 0c9bd16aa1..6824647c25 100644 --- a/Mage.Sets/src/mage/cards/p/PraetorianTrooper.java +++ b/Mage.Sets/src/mage/cards/p/PraetorianTrooper.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -23,7 +22,7 @@ public final class PraetorianTrooper extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Trooper creatures"); static { - filter.add(new SubtypePredicate(SubType.TROOPER)); + filter.add(SubType.TROOPER.getPredicate()); } public PraetorianTrooper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PreeminentCaptain.java b/Mage.Sets/src/mage/cards/p/PreeminentCaptain.java index 9207889fda..c17a7dc82a 100644 --- a/Mage.Sets/src/mage/cards/p/PreeminentCaptain.java +++ b/Mage.Sets/src/mage/cards/p/PreeminentCaptain.java @@ -14,7 +14,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -55,7 +54,7 @@ class PreeminentCaptainEffect extends OneShotEffect { private static final FilterCreatureCard filter = new FilterCreatureCard("a soldier creature card"); static { - filter.add(new SubtypePredicate(SubType.SOLDIER)); + filter.add(SubType.SOLDIER.getPredicate()); } public PreeminentCaptainEffect() { diff --git a/Mage.Sets/src/mage/cards/p/PriestOfTheWakeningSun.java b/Mage.Sets/src/mage/cards/p/PriestOfTheWakeningSun.java index c13b1000e7..f6fbe49e04 100644 --- a/Mage.Sets/src/mage/cards/p/PriestOfTheWakeningSun.java +++ b/Mage.Sets/src/mage/cards/p/PriestOfTheWakeningSun.java @@ -21,7 +21,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInHand; @@ -36,7 +35,7 @@ public final class PriestOfTheWakeningSun extends CardImpl { private static final FilterCard filter = new FilterCard("Dinosaur card"); static { - filter.add(new SubtypePredicate(SubType.DINOSAUR)); + filter.add(SubType.DINOSAUR.getPredicate()); } public PriestOfTheWakeningSun(UUID ownerId, CardSetInfo setInfo) { @@ -73,7 +72,7 @@ class PriestOfTheWakeningSunEffect extends OneShotEffect { private static final FilterCard filter = new FilterCard("a Dinosaur card to reveal"); static { - filter.add(new SubtypePredicate(SubType.DINOSAUR)); + filter.add(SubType.DINOSAUR.getPredicate()); } PriestOfTheWakeningSunEffect() { diff --git a/Mage.Sets/src/mage/cards/p/PriestOfTitania.java b/Mage.Sets/src/mage/cards/p/PriestOfTitania.java index 2beda0e5cd..445d855e57 100644 --- a/Mage.Sets/src/mage/cards/p/PriestOfTitania.java +++ b/Mage.Sets/src/mage/cards/p/PriestOfTitania.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -23,7 +22,7 @@ public final class PriestOfTitania extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Elf on the battlefield"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public PriestOfTitania(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PrimalBellow.java b/Mage.Sets/src/mage/cards/p/PrimalBellow.java index 18a5b8ad54..e285157b64 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalBellow.java +++ b/Mage.Sets/src/mage/cards/p/PrimalBellow.java @@ -11,7 +11,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -24,7 +23,7 @@ public final class PrimalBellow extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Forest you control"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/p/PrimalBeyond.java b/Mage.Sets/src/mage/cards/p/PrimalBeyond.java index c1096536de..b012bf852e 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalBeyond.java +++ b/Mage.Sets/src/mage/cards/p/PrimalBeyond.java @@ -19,7 +19,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.target.common.TargetCardInHand; @@ -32,7 +31,7 @@ public final class PrimalBeyond extends CardImpl { private static final FilterCard filter = new FilterCard("a Elemental card from your hand"); static { - filter.add(new SubtypePredicate(SubType.ELEMENTAL)); + filter.add(SubType.ELEMENTAL.getPredicate()); } public PrimalBeyond(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PrimevalForce.java b/Mage.Sets/src/mage/cards/p/PrimevalForce.java index 38c07874b2..24ee8882a1 100644 --- a/Mage.Sets/src/mage/cards/p/PrimevalForce.java +++ b/Mage.Sets/src/mage/cards/p/PrimevalForce.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -22,7 +21,7 @@ public final class PrimevalForce extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("three Forests"); static{ - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public PrimevalForce(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PrincessLeia.java b/Mage.Sets/src/mage/cards/p/PrincessLeia.java index 9bcae9ff49..02bfb3f280 100644 --- a/Mage.Sets/src/mage/cards/p/PrincessLeia.java +++ b/Mage.Sets/src/mage/cards/p/PrincessLeia.java @@ -1,7 +1,6 @@ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -15,12 +14,12 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.permanent.token.RebelToken; +import java.util.UUID; + /** - * * @author Styxo */ public final class PrincessLeia extends CardImpl { @@ -29,10 +28,9 @@ public final class PrincessLeia extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("Rebel creature you control"); static { - SubtypePredicate rebel = new SubtypePredicate(SubType.REBEL); filter1.add(AnotherPredicate.instance); - filter1.add(rebel); - filter2.add(rebel); + filter1.add(SubType.REBEL.getPredicate()); + filter2.add(SubType.REBEL.getPredicate()); } public PrincessLeia(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PrizedElephant.java b/Mage.Sets/src/mage/cards/p/PrizedElephant.java index 2ef52d9c30..6805bf8351 100644 --- a/Mage.Sets/src/mage/cards/p/PrizedElephant.java +++ b/Mage.Sets/src/mage/cards/p/PrizedElephant.java @@ -19,7 +19,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -31,7 +30,7 @@ public final class PrizedElephant extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("a Forest"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public PrizedElephant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/ProfanePrayers.java b/Mage.Sets/src/mage/cards/p/ProfanePrayers.java index f48c8a3c07..e9d2f427c0 100644 --- a/Mage.Sets/src/mage/cards/p/ProfanePrayers.java +++ b/Mage.Sets/src/mage/cards/p/ProfanePrayers.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetAnyTarget; /** @@ -22,7 +21,7 @@ public final class ProfanePrayers extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Cleric on the battlefield"); static { - filter.add(new SubtypePredicate(SubType.CLERIC)); + filter.add(SubType.CLERIC.getPredicate()); } public ProfanePrayers(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/ProwessOfTheFair.java b/Mage.Sets/src/mage/cards/p/ProwessOfTheFair.java index 990e3e7b7e..517b32c107 100644 --- a/Mage.Sets/src/mage/cards/p/ProwessOfTheFair.java +++ b/Mage.Sets/src/mage/cards/p/ProwessOfTheFair.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.ElfToken; @@ -24,7 +23,7 @@ public final class ProwessOfTheFair extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("another nontoken Elf"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); filter.add(AnotherPredicate.instance); filter.add(Predicates.not(TokenPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/p/ProwlersHelm.java b/Mage.Sets/src/mage/cards/p/ProwlersHelm.java index f6cda63d1b..fe9ee90b09 100644 --- a/Mage.Sets/src/mage/cards/p/ProwlersHelm.java +++ b/Mage.Sets/src/mage/cards/p/ProwlersHelm.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -21,7 +20,7 @@ public final class ProwlersHelm extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("except by Walls"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.WALL))); + filter.add(Predicates.not(SubType.WALL.getPredicate())); } public ProwlersHelm(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PsychicAllergy.java b/Mage.Sets/src/mage/cards/p/PsychicAllergy.java index 77c2c62160..2bf251d0ba 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicAllergy.java +++ b/Mage.Sets/src/mage/cards/p/PsychicAllergy.java @@ -22,7 +22,6 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; import mage.players.Player; @@ -37,7 +36,7 @@ public final class PsychicAllergy extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("two Islands"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } public PsychicAllergy(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PsychicSpear.java b/Mage.Sets/src/mage/cards/p/PsychicSpear.java index 90538c254b..a38eabdf44 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicSpear.java +++ b/Mage.Sets/src/mage/cards/p/PsychicSpear.java @@ -10,7 +10,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPlayer; /** @@ -22,7 +21,7 @@ public final class PsychicSpear extends CardImpl { private static final FilterCard filter = new FilterCard("a Spirit or Arcane card to discard"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.SPIRIT),new SubtypePredicate(SubType.ARCANE))); + filter.add(Predicates.or(SubType.SPIRIT.getPredicate(),SubType.ARCANE.getPredicate())); } public PsychicSpear(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PsychicTrance.java b/Mage.Sets/src/mage/cards/p/PsychicTrance.java index f971950271..8796e10aeb 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicTrance.java +++ b/Mage.Sets/src/mage/cards/p/PsychicTrance.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetSpell; /** @@ -27,7 +26,7 @@ public final class PsychicTrance extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Wizards you control"); static { - filter.add(new SubtypePredicate(SubType.WIZARD)); + filter.add(SubType.WIZARD.getPredicate()); } public PsychicTrance(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PsychotropeThallid.java b/Mage.Sets/src/mage/cards/p/PsychotropeThallid.java index a7dd5d1a0b..864e28b43d 100644 --- a/Mage.Sets/src/mage/cards/p/PsychotropeThallid.java +++ b/Mage.Sets/src/mage/cards/p/PsychotropeThallid.java @@ -20,7 +20,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SaprolingToken; import mage.target.common.TargetControlledCreaturePermanent; @@ -32,7 +31,7 @@ public final class PsychotropeThallid extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a Saproling"); static { - filter.add(new SubtypePredicate(SubType.SAPROLING)); + filter.add(SubType.SAPROLING.getPredicate()); } public PsychotropeThallid(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PterodonKnight.java b/Mage.Sets/src/mage/cards/p/PterodonKnight.java index 0907fd414c..d82bb70a65 100644 --- a/Mage.Sets/src/mage/cards/p/PterodonKnight.java +++ b/Mage.Sets/src/mage/cards/p/PterodonKnight.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class PterodonKnight extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Dinosaur"); static { - filter.add(new SubtypePredicate(SubType.DINOSAUR)); + filter.add(SubType.DINOSAUR.getPredicate()); } public PterodonKnight(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/Pulverize.java b/Mage.Sets/src/mage/cards/p/Pulverize.java index e6487be466..ad2ca69b5f 100644 --- a/Mage.Sets/src/mage/cards/p/Pulverize.java +++ b/Mage.Sets/src/mage/cards/p/Pulverize.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterArtifactPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -22,7 +21,7 @@ public final class Pulverize extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("two Mountains"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public Pulverize(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PuppetConjurer.java b/Mage.Sets/src/mage/cards/p/PuppetConjurer.java index 8e4ef71c2a..2dbff4a52a 100644 --- a/Mage.Sets/src/mage/cards/p/PuppetConjurer.java +++ b/Mage.Sets/src/mage/cards/p/PuppetConjurer.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.HomunculusToken; /** @@ -29,7 +28,7 @@ public final class PuppetConjurer extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Homunculus"); static { - filter.add(new SubtypePredicate(SubType.HOMUNCULUS)); + filter.add(SubType.HOMUNCULUS.getPredicate()); } public PuppetConjurer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PureReflection.java b/Mage.Sets/src/mage/cards/p/PureReflection.java index 2aa2614113..cad8231b33 100644 --- a/Mage.Sets/src/mage/cards/p/PureReflection.java +++ b/Mage.Sets/src/mage/cards/p/PureReflection.java @@ -14,7 +14,6 @@ import mage.constants.SetTargetPointer; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureSpell; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.token.ReflectionPureToken; import mage.game.stack.Spell; @@ -68,7 +67,7 @@ public final class PureReflection extends CardImpl { // destroy all Reflections FilterPermanent filter = new FilterPermanent("Reflections"); - filter.add(new SubtypePredicate(SubType.REFLECTION)); + filter.add(SubType.REFLECTION.getPredicate()); game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game).forEach((permanent) -> { permanent.destroy(source.getSourceId(), game,false); }); diff --git a/Mage.Sets/src/mage/cards/p/PureSimple.java b/Mage.Sets/src/mage/cards/p/PureSimple.java index e14378e1c5..8502df81bd 100644 --- a/Mage.Sets/src/mage/cards/p/PureSimple.java +++ b/Mage.Sets/src/mage/cards/p/PureSimple.java @@ -11,7 +11,6 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.MulticoloredPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import java.util.UUID; @@ -26,7 +25,7 @@ public final class PureSimple extends SplitCard { private static final FilterPermanent filterMulticolor = new FilterPermanent("multicolored permanent"); static { - filterDestroy.add(Predicates.or(new SubtypePredicate(SubType.AURA), new SubtypePredicate(SubType.EQUIPMENT))); + filterDestroy.add(Predicates.or(SubType.AURA.getPredicate(), SubType.EQUIPMENT.getPredicate())); filterMulticolor.add(MulticoloredPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/p/PuresteelPaladin.java b/Mage.Sets/src/mage/cards/p/PuresteelPaladin.java index 19252b5c05..ae6c3fcf39 100644 --- a/Mage.Sets/src/mage/cards/p/PuresteelPaladin.java +++ b/Mage.Sets/src/mage/cards/p/PuresteelPaladin.java @@ -17,7 +17,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @author Loki @@ -26,7 +25,7 @@ public final class PuresteelPaladin extends CardImpl { private static final FilterPermanent filter = new FilterControlledPermanent("Equipment"); static { - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); } public PuresteelPaladin(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PutridRaptor.java b/Mage.Sets/src/mage/cards/p/PutridRaptor.java index 75e5669571..b86896e9a7 100644 --- a/Mage.Sets/src/mage/cards/p/PutridRaptor.java +++ b/Mage.Sets/src/mage/cards/p/PutridRaptor.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -21,7 +20,7 @@ public final class PutridRaptor extends CardImpl { private static final FilterCard filter = new FilterCard("a Zombie card"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public PutridRaptor(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/Pyramids.java b/Mage.Sets/src/mage/cards/p/Pyramids.java index 4dafc88e56..27ccfebf90 100644 --- a/Mage.Sets/src/mage/cards/p/Pyramids.java +++ b/Mage.Sets/src/mage/cards/p/Pyramids.java @@ -18,7 +18,6 @@ import mage.constants.Zone; import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.predicate.ObjectPlayer; import mage.filter.predicate.ObjectPlayerPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetLandPermanent; @@ -32,7 +31,7 @@ public final class Pyramids extends CardImpl { private static final FilterEnchantmentPermanent filter = new FilterEnchantmentPermanent("Auras attached to a land"); static { - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); filter.add(new PyramidsPredicate()); } diff --git a/Mage.Sets/src/mage/cards/q/QasaliAmbusher.java b/Mage.Sets/src/mage/cards/q/QasaliAmbusher.java index 28cf858f5d..9fa8d53023 100644 --- a/Mage.Sets/src/mage/cards/q/QasaliAmbusher.java +++ b/Mage.Sets/src/mage/cards/q/QasaliAmbusher.java @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.combat.CombatGroup; @@ -53,8 +52,8 @@ class QasaliAmbusherAbility extends ActivatedAbilityImpl { private static final FilterControlledLandPermanent filterForest = new FilterControlledLandPermanent(); static { - filterPlains.add(new SubtypePredicate(SubType.PLAINS)); - filterForest.add(new SubtypePredicate(SubType.FOREST)); + filterPlains.add(SubType.PLAINS.getPredicate()); + filterForest.add(SubType.FOREST.getPredicate()); } public QasaliAmbusherAbility() { diff --git a/Mage.Sets/src/mage/cards/q/QuagSickness.java b/Mage.Sets/src/mage/cards/q/QuagSickness.java index a2ea93220c..880682d77e 100644 --- a/Mage.Sets/src/mage/cards/q/QuagSickness.java +++ b/Mage.Sets/src/mage/cards/q/QuagSickness.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -26,7 +25,7 @@ public final class QuagSickness extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Swamp you control"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/q/QuestForTheGoblinLord.java b/Mage.Sets/src/mage/cards/q/QuestForTheGoblinLord.java index 80c2b92ca5..3d6137b00e 100644 --- a/Mage.Sets/src/mage/cards/q/QuestForTheGoblinLord.java +++ b/Mage.Sets/src/mage/cards/q/QuestForTheGoblinLord.java @@ -14,7 +14,6 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -29,7 +28,7 @@ public final class QuestForTheGoblinLord extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - goblinFilter.add(new SubtypePredicate(SubType.GOBLIN)); + goblinFilter.add(SubType.GOBLIN.getPredicate()); } public QuestForTheGoblinLord(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/q/QuestForTheHolyRelic.java b/Mage.Sets/src/mage/cards/q/QuestForTheHolyRelic.java index 984098d5fe..5822c53777 100644 --- a/Mage.Sets/src/mage/cards/q/QuestForTheHolyRelic.java +++ b/Mage.Sets/src/mage/cards/q/QuestForTheHolyRelic.java @@ -19,7 +19,6 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterCard; import mage.filter.StaticFilters; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -78,7 +77,7 @@ class QuestForTheHolyRelicEffect extends OneShotEffect { } FilterCard filter = new FilterCard("Equipment"); - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); TargetCardInLibrary target = new TargetCardInLibrary(filter); if (controller.searchLibrary(target, source, game)) { Card card = controller.getLibrary().getCard(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/q/QuestForUlasTemple.java b/Mage.Sets/src/mage/cards/q/QuestForUlasTemple.java index 69e19590ab..3fc788d13f 100644 --- a/Mage.Sets/src/mage/cards/q/QuestForUlasTemple.java +++ b/Mage.Sets/src/mage/cards/q/QuestForUlasTemple.java @@ -17,7 +17,6 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -39,10 +38,10 @@ public final class QuestForUlasTemple extends CardImpl { // At the beginning of each end step, if there are three or more quest counters on Quest for Ula's Temple, you may put a Kraken, Leviathan, Octopus, or Serpent creature card from your hand onto the battlefield. FilterCreatureCard filter = new FilterCreatureCard("Kraken, Leviathan, Octopus, or Serpent creature card"); filter.add(Predicates.or( - new SubtypePredicate(SubType.KRAKEN), - new SubtypePredicate(SubType.LEVIATHAN), - new SubtypePredicate(SubType.OCTOPUS), - new SubtypePredicate(SubType.SERPENT))); + SubType.KRAKEN.getPredicate(), + SubType.LEVIATHAN.getPredicate(), + SubType.OCTOPUS.getPredicate(), + SubType.SERPENT.getPredicate())); this.addAbility(new QuestForUlasTempleTriggeredAbility(new PutCardFromHandOntoBattlefieldEffect(filter))); } diff --git a/Mage.Sets/src/mage/cards/q/QuickSliver.java b/Mage.Sets/src/mage/cards/q/QuickSliver.java index 32fd9b1b01..7f6ecbdadd 100644 --- a/Mage.Sets/src/mage/cards/q/QuickSliver.java +++ b/Mage.Sets/src/mage/cards/q/QuickSliver.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -23,7 +22,7 @@ public final class QuickSliver extends CardImpl { private static final FilterCreatureCard filter = new FilterCreatureCard("Sliver cards"); static { - filter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); } public QuickSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/q/QuicksilverFountain.java b/Mage.Sets/src/mage/cards/q/QuicksilverFountain.java index 13acce4435..b188158a85 100644 --- a/Mage.Sets/src/mage/cards/q/QuicksilverFountain.java +++ b/Mage.Sets/src/mage/cards/q/QuicksilverFountain.java @@ -22,7 +22,6 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -70,7 +69,7 @@ enum QuicksilverFountainAdjuster implements TargetAdjuster { if (activePlayer != null) { ability.getTargets().clear(); FilterLandPermanent filter = new FilterLandPermanent(); - filter.add(Predicates.not(new SubtypePredicate(SubType.ISLAND))); + filter.add(Predicates.not(SubType.ISLAND.getPredicate())); filter.add(new ControllerPredicate(TargetController.ACTIVE)); TargetLandPermanent target = new TargetLandPermanent(1, 1, filter, false); target.setTargetController(activePlayer.getId()); @@ -149,7 +148,7 @@ class AllLandsAreSubtypeCondition implements Condition { @Override public boolean apply(Game game, Ability source) { FilterLandPermanent filterLand = new FilterLandPermanent(); - filterLand.add(new SubtypePredicate(subtype)); + filterLand.add(subtype.getPredicate()); int landCount = game.getBattlefield().getAllActivePermanents(CardType.LAND).size(); return game.getBattlefield().getAllActivePermanents(filterLand, game).size() == landCount; } diff --git a/Mage.Sets/src/mage/cards/q/QuillSlingerBoggart.java b/Mage.Sets/src/mage/cards/q/QuillSlingerBoggart.java index 59124d16da..0c67c1bbe8 100644 --- a/Mage.Sets/src/mage/cards/q/QuillSlingerBoggart.java +++ b/Mage.Sets/src/mage/cards/q/QuillSlingerBoggart.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPlayer; /** @@ -23,7 +22,7 @@ public final class QuillSlingerBoggart extends CardImpl { private static final FilterSpell filter = new FilterSpell("a Kithkin spell"); static { - filter.add(new SubtypePredicate(SubType.KITHKIN)); + filter.add(SubType.KITHKIN.getPredicate()); } public QuillSlingerBoggart(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/q/QuirionRanger.java b/Mage.Sets/src/mage/cards/q/QuirionRanger.java index bb3bacc194..4ba1ae546d 100644 --- a/Mage.Sets/src/mage/cards/q/QuirionRanger.java +++ b/Mage.Sets/src/mage/cards/q/QuirionRanger.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -27,7 +26,7 @@ public final class QuirionRanger extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Forest"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public QuirionRanger(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RageForger.java b/Mage.Sets/src/mage/cards/r/RageForger.java index fb10108d1d..c15dd3e0af 100644 --- a/Mage.Sets/src/mage/cards/r/RageForger.java +++ b/Mage.Sets/src/mage/cards/r/RageForger.java @@ -17,7 +17,6 @@ import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.CounterPredicate; @@ -36,7 +35,7 @@ public final class RageForger extends CardImpl { private static final FilterControlledCreaturePermanent filterAttack = new FilterControlledCreaturePermanent("creature you control with a +1/+1 counter on it"); static { - filter.add(new SubtypePredicate(SubType.SHAMAN)); + filter.add(SubType.SHAMAN.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(AnotherPredicate.instance); filterAttack.add(new CounterPredicate(CounterType.P1P1)); diff --git a/Mage.Sets/src/mage/cards/r/Ragemonger.java b/Mage.Sets/src/mage/cards/r/Ragemonger.java index 7e655bc4bb..2d91a0319a 100644 --- a/Mage.Sets/src/mage/cards/r/Ragemonger.java +++ b/Mage.Sets/src/mage/cards/r/Ragemonger.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class Ragemonger extends CardImpl { private static final FilterCard filter = new FilterCard("Minotaur spells"); static { - filter.add(new SubtypePredicate(SubType.MINOTAUR)); + filter.add(SubType.MINOTAUR.getPredicate()); } public Ragemonger(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RaidingParty.java b/Mage.Sets/src/mage/cards/r/RaidingParty.java index 7e93728e68..35168604c6 100644 --- a/Mage.Sets/src/mage/cards/r/RaidingParty.java +++ b/Mage.Sets/src/mage/cards/r/RaidingParty.java @@ -24,7 +24,6 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -44,7 +43,7 @@ public final class RaidingParty extends CardImpl { static { filterWhite.add(new ColorPredicate(ObjectColor.WHITE)); - filterOrc.add(new SubtypePredicate(SubType.ORC)); + filterOrc.add(SubType.ORC.getPredicate()); } public RaidingParty(UUID ownerId, CardSetInfo setInfo) { @@ -75,7 +74,7 @@ class RaidingPartyEffect extends OneShotEffect { static { filter.add(Predicates.not(TappedPredicate.instance)); filter.add(new ColorPredicate(ObjectColor.WHITE)); - filter2.add(new SubtypePredicate(SubType.PLAINS)); + filter2.add(SubType.PLAINS.getPredicate()); } RaidingPartyEffect() { diff --git a/Mage.Sets/src/mage/cards/r/RaisedByWolves.java b/Mage.Sets/src/mage/cards/r/RaisedByWolves.java index 557af66fab..e63e198969 100644 --- a/Mage.Sets/src/mage/cards/r/RaisedByWolves.java +++ b/Mage.Sets/src/mage/cards/r/RaisedByWolves.java @@ -15,7 +15,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.WolfToken; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -29,7 +28,7 @@ public final class RaisedByWolves extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Wolf you control"); static { - filter.add(new SubtypePredicate(SubType.WOLF)); + filter.add(SubType.WOLF.getPredicate()); } public RaisedByWolves(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RakdosTheDefiler.java b/Mage.Sets/src/mage/cards/r/RakdosTheDefiler.java index c974dfc5ea..85ae409bf4 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosTheDefiler.java +++ b/Mage.Sets/src/mage/cards/r/RakdosTheDefiler.java @@ -22,7 +22,6 @@ import mage.constants.SuperType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -34,8 +33,8 @@ public final class RakdosTheDefiler extends CardImpl { private static final FilterPermanent damageToPlayerTriggerFilter = new FilterPermanent("the non-Demon permanents you control"); static { - attackTriggerFilter.add(Predicates.not(new SubtypePredicate(SubType.DEMON))); - damageToPlayerTriggerFilter.add(Predicates.not(new SubtypePredicate(SubType.DEMON))); + attackTriggerFilter.add(Predicates.not(SubType.DEMON.getPredicate())); + damageToPlayerTriggerFilter.add(Predicates.not(SubType.DEMON.getPredicate())); } public RakdosTheDefiler(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RakshaGoldenCub.java b/Mage.Sets/src/mage/cards/r/RakshaGoldenCub.java index 0b1102686d..21a689fdf0 100644 --- a/Mage.Sets/src/mage/cards/r/RakshaGoldenCub.java +++ b/Mage.Sets/src/mage/cards/r/RakshaGoldenCub.java @@ -16,7 +16,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -28,7 +27,7 @@ public final class RakshaGoldenCub extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Cat creatures you control"); static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.CAT)); + filter.add(SubType.CAT.getPredicate()); } public RakshaGoldenCub(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RalsStaticaster.java b/Mage.Sets/src/mage/cards/r/RalsStaticaster.java index 4a7af07363..238140c181 100644 --- a/Mage.Sets/src/mage/cards/r/RalsStaticaster.java +++ b/Mage.Sets/src/mage/cards/r/RalsStaticaster.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -30,7 +29,7 @@ public final class RalsStaticaster extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(CardType.PLANESWALKER.getPredicate()); - filter.add(new SubtypePredicate(SubType.RAL)); + filter.add(SubType.RAL.getPredicate()); } public RalsStaticaster(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RamosianCaptain.java b/Mage.Sets/src/mage/cards/r/RamosianCaptain.java index 2d447fd8cd..0b51ca5ea5 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianCaptain.java +++ b/Mage.Sets/src/mage/cards/r/RamosianCaptain.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -30,7 +29,7 @@ public final class RamosianCaptain extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with converted mana cost 4 or less"); static { - filter.add(new SubtypePredicate(SubType.REBEL)); + filter.add(SubType.REBEL.getPredicate()); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 5)); } diff --git a/Mage.Sets/src/mage/cards/r/RamosianCommander.java b/Mage.Sets/src/mage/cards/r/RamosianCommander.java index 7379a75c9c..b585586019 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianCommander.java +++ b/Mage.Sets/src/mage/cards/r/RamosianCommander.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -29,7 +28,7 @@ public final class RamosianCommander extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with converted mana cost 5 or less"); static { - filter.add(new SubtypePredicate(SubType.REBEL)); + filter.add(SubType.REBEL.getPredicate()); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 6)); } diff --git a/Mage.Sets/src/mage/cards/r/RamosianLieutenant.java b/Mage.Sets/src/mage/cards/r/RamosianLieutenant.java index 154d0916e1..fdb566f6a3 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianLieutenant.java +++ b/Mage.Sets/src/mage/cards/r/RamosianLieutenant.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -29,7 +28,7 @@ public final class RamosianLieutenant extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with converted mana cost 3 or less"); static { - filter.add(new SubtypePredicate(SubType.REBEL)); + filter.add(SubType.REBEL.getPredicate()); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); } diff --git a/Mage.Sets/src/mage/cards/r/RamosianRally.java b/Mage.Sets/src/mage/cards/r/RamosianRally.java index 6f9b2d78da..81df8b966b 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianRally.java +++ b/Mage.Sets/src/mage/cards/r/RamosianRally.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -28,7 +27,7 @@ public final class RamosianRally extends CardImpl { private static final FilterControlledCreaturePermanent creatureFilter = new FilterControlledCreaturePermanent("an untapped creature you control"); static { - plainsFilter.add(new SubtypePredicate(SubType.PLAINS)); + plainsFilter.add(SubType.PLAINS.getPredicate()); creatureFilter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/r/RamosianRevivalist.java b/Mage.Sets/src/mage/cards/r/RamosianRevivalist.java index 7550b9e589..32bb1a1961 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianRevivalist.java +++ b/Mage.Sets/src/mage/cards/r/RamosianRevivalist.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInYourGraveyard; /** @@ -28,7 +27,7 @@ public final class RamosianRevivalist extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with converted mana cost 5 or less from your graveyard"); static { - filter.add(new SubtypePredicate(SubType.REBEL)); + filter.add(SubType.REBEL.getPredicate()); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 6)); } diff --git a/Mage.Sets/src/mage/cards/r/RamosianSergeant.java b/Mage.Sets/src/mage/cards/r/RamosianSergeant.java index 4200c52da1..e88e51567d 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianSergeant.java +++ b/Mage.Sets/src/mage/cards/r/RamosianSergeant.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -28,7 +27,7 @@ public final class RamosianSergeant extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with converted mana cost 2 or less"); static { - filter.add(new SubtypePredicate(SubType.REBEL)); + filter.add(SubType.REBEL.getPredicate()); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); } diff --git a/Mage.Sets/src/mage/cards/r/RamosianSkyMarshal.java b/Mage.Sets/src/mage/cards/r/RamosianSkyMarshal.java index 66917707c5..1fdaacfac4 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianSkyMarshal.java +++ b/Mage.Sets/src/mage/cards/r/RamosianSkyMarshal.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -29,7 +28,7 @@ public final class RamosianSkyMarshal extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with converted mana cost 6 or less"); static { - filter.add(new SubtypePredicate(SubType.REBEL)); + filter.add(SubType.REBEL.getPredicate()); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 7)); } diff --git a/Mage.Sets/src/mage/cards/r/RampartCrawler.java b/Mage.Sets/src/mage/cards/r/RampartCrawler.java index a73d75ff47..1c3253295d 100644 --- a/Mage.Sets/src/mage/cards/r/RampartCrawler.java +++ b/Mage.Sets/src/mage/cards/r/RampartCrawler.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -23,7 +22,7 @@ public final class RampartCrawler extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Walls"); static { - filter.add(new SubtypePredicate(SubType.WALL)); + filter.add(SubType.WALL.getPredicate()); } public RampartCrawler(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RampartSmasher.java b/Mage.Sets/src/mage/cards/r/RampartSmasher.java index 381abf43da..c4186c0430 100644 --- a/Mage.Sets/src/mage/cards/r/RampartSmasher.java +++ b/Mage.Sets/src/mage/cards/r/RampartSmasher.java @@ -10,7 +10,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -23,8 +22,8 @@ public final class RampartSmasher extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.KNIGHT), - new SubtypePredicate(SubType.WALL) + SubType.KNIGHT.getPredicate(), + SubType.WALL.getPredicate() )); } diff --git a/Mage.Sets/src/mage/cards/r/RamunapHydra.java b/Mage.Sets/src/mage/cards/r/RamunapHydra.java index 38a86af768..f6402e7cec 100644 --- a/Mage.Sets/src/mage/cards/r/RamunapHydra.java +++ b/Mage.Sets/src/mage/cards/r/RamunapHydra.java @@ -22,7 +22,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -71,7 +70,7 @@ class RamunapHydraBoostEffect extends WhileConditionContinuousEffect { private static final FilterCard filter = new FilterCard("a Desert"); static { - filter.add(new SubtypePredicate(SubType.DESERT)); + filter.add(SubType.DESERT.getPredicate()); } private final int power; diff --git a/Mage.Sets/src/mage/cards/r/RamunapRuins.java b/Mage.Sets/src/mage/cards/r/RamunapRuins.java index 20886a354b..605bdfbe96 100644 --- a/Mage.Sets/src/mage/cards/r/RamunapRuins.java +++ b/Mage.Sets/src/mage/cards/r/RamunapRuins.java @@ -20,7 +20,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -32,7 +31,7 @@ public final class RamunapRuins extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Desert"); static { - filter.add(new SubtypePredicate(SubType.DESERT)); + filter.add(SubType.DESERT.getPredicate()); } public RamunapRuins(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RangeTrooper.java b/Mage.Sets/src/mage/cards/r/RangeTrooper.java index 6dfb18ef5e..d3606f0131 100644 --- a/Mage.Sets/src/mage/cards/r/RangeTrooper.java +++ b/Mage.Sets/src/mage/cards/r/RangeTrooper.java @@ -15,7 +15,6 @@ import mage.constants.*; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; @@ -30,7 +29,7 @@ public final class RangeTrooper extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Trooper creatures you control"); static { - filter.add(new SubtypePredicate(SubType.TROOPER)); + filter.add(SubType.TROOPER.getPredicate()); } public RangeTrooper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RangersPath.java b/Mage.Sets/src/mage/cards/r/RangersPath.java index 87e87a1591..b9b9e3ad1a 100644 --- a/Mage.Sets/src/mage/cards/r/RangersPath.java +++ b/Mage.Sets/src/mage/cards/r/RangersPath.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterLandCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -20,7 +19,7 @@ public final class RangersPath extends CardImpl { private static final FilterLandCard filter = new FilterLandCard("Forest cards"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public RangersPath(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RashidaScalebane.java b/Mage.Sets/src/mage/cards/r/RashidaScalebane.java index af3c5daf3d..9707ea4330 100644 --- a/Mage.Sets/src/mage/cards/r/RashidaScalebane.java +++ b/Mage.Sets/src/mage/cards/r/RashidaScalebane.java @@ -18,7 +18,6 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AttackingPredicate; import mage.filter.predicate.permanent.BlockingPredicate; import mage.target.common.TargetCreaturePermanent; @@ -33,7 +32,7 @@ public final class RashidaScalebane extends CardImpl { static { filter.add(Predicates.or(AttackingPredicate.instance, BlockingPredicate.instance)); - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } public RashidaScalebane(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RatColony.java b/Mage.Sets/src/mage/cards/r/RatColony.java index ac4d8ab9cc..04b90b9aa9 100644 --- a/Mage.Sets/src/mage/cards/r/RatColony.java +++ b/Mage.Sets/src/mage/cards/r/RatColony.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -27,7 +26,7 @@ public final class RatColony extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other Rat you control"); static { - filter.add(new SubtypePredicate(SubType.RAT)); + filter.add(SubType.RAT.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/r/Ratcatcher.java b/Mage.Sets/src/mage/cards/r/Ratcatcher.java index decdb5171a..f1caf034c2 100644 --- a/Mage.Sets/src/mage/cards/r/Ratcatcher.java +++ b/Mage.Sets/src/mage/cards/r/Ratcatcher.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -25,7 +24,7 @@ public final class Ratcatcher extends CardImpl { private static final FilterCard filter = new FilterCard("Rat card"); static { - filter.add(new SubtypePredicate(SubType.RAT)); + filter.add(SubType.RAT.getPredicate()); } public Ratcatcher(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RathiAssassin.java b/Mage.Sets/src/mage/cards/r/RathiAssassin.java index 07655c7778..0a5cc72483 100644 --- a/Mage.Sets/src/mage/cards/r/RathiAssassin.java +++ b/Mage.Sets/src/mage/cards/r/RathiAssassin.java @@ -22,7 +22,6 @@ import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetCreaturePermanent; @@ -37,7 +36,7 @@ public final class RathiAssassin extends CardImpl { private static final FilterCreaturePermanent destroyFilter = new FilterCreaturePermanent("tapped nonblack creature"); static { - filter.add(new SubtypePredicate(SubType.MERCENARY)); + filter.add(SubType.MERCENARY.getPredicate()); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); destroyFilter.add(TappedPredicate.instance); destroyFilter.add(Predicates.not(new ColorPredicate(ObjectColor.BLACK))); diff --git a/Mage.Sets/src/mage/cards/r/RathiDragon.java b/Mage.Sets/src/mage/cards/r/RathiDragon.java index 4301e92604..baf0793b41 100644 --- a/Mage.Sets/src/mage/cards/r/RathiDragon.java +++ b/Mage.Sets/src/mage/cards/r/RathiDragon.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -24,7 +23,7 @@ public final class RathiDragon extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("two Mountains"); static{ - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public RathiDragon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RathiFiend.java b/Mage.Sets/src/mage/cards/r/RathiFiend.java index c71c3d0153..4052ab697e 100644 --- a/Mage.Sets/src/mage/cards/r/RathiFiend.java +++ b/Mage.Sets/src/mage/cards/r/RathiFiend.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -30,7 +29,7 @@ public final class RathiFiend extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with converted mana cost 3 or less"); static { - filter.add(new SubtypePredicate(SubType.MERCENARY)); + filter.add(SubType.MERCENARY.getPredicate()); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); } diff --git a/Mage.Sets/src/mage/cards/r/RathiIntimidator.java b/Mage.Sets/src/mage/cards/r/RathiIntimidator.java index dda481c567..76ed880b66 100644 --- a/Mage.Sets/src/mage/cards/r/RathiIntimidator.java +++ b/Mage.Sets/src/mage/cards/r/RathiIntimidator.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -29,7 +28,7 @@ public final class RathiIntimidator extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("Mercenary permanent card with converted mana cost 2 or less"); static { - filter.add(new SubtypePredicate(SubType.MERCENARY)); + filter.add(SubType.MERCENARY.getPredicate()); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); } diff --git a/Mage.Sets/src/mage/cards/r/Rattlechains.java b/Mage.Sets/src/mage/cards/r/Rattlechains.java index 7515fbb1fd..0258122205 100644 --- a/Mage.Sets/src/mage/cards/r/Rattlechains.java +++ b/Mage.Sets/src/mage/cards/r/Rattlechains.java @@ -19,7 +19,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -32,8 +31,8 @@ public final class Rattlechains extends CardImpl { private static final FilterCard filterCard = new FilterCard("Spirit spells"); static { - filter.add(new SubtypePredicate(SubType.SPIRIT)); - filterCard.add(new SubtypePredicate(SubType.SPIRIT)); + filter.add(SubType.SPIRIT.getPredicate()); + filterCard.add(SubType.SPIRIT.getPredicate()); } public Rattlechains(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RavenGuildInitiate.java b/Mage.Sets/src/mage/cards/r/RavenGuildInitiate.java index 7126813d07..0739dd154f 100644 --- a/Mage.Sets/src/mage/cards/r/RavenGuildInitiate.java +++ b/Mage.Sets/src/mage/cards/r/RavenGuildInitiate.java @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -22,7 +21,7 @@ public final class RavenGuildInitiate extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Bird"); static { - filter.add(new SubtypePredicate(SubType.BIRD)); + filter.add(SubType.BIRD.getPredicate()); } public RavenGuildInitiate(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RavenousBaloth.java b/Mage.Sets/src/mage/cards/r/RavenousBaloth.java index d62d55cd91..d3697f784a 100644 --- a/Mage.Sets/src/mage/cards/r/RavenousBaloth.java +++ b/Mage.Sets/src/mage/cards/r/RavenousBaloth.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -23,7 +22,7 @@ public final class RavenousBaloth extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a Beast"); static { - filter.add(new SubtypePredicate(SubType.BEAST)); + filter.add(SubType.BEAST.getPredicate()); } public RavenousBaloth(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RavenousDemon.java b/Mage.Sets/src/mage/cards/r/RavenousDemon.java index d9d4e51e65..3696c382d2 100644 --- a/Mage.Sets/src/mage/cards/r/RavenousDemon.java +++ b/Mage.Sets/src/mage/cards/r/RavenousDemon.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -24,7 +23,7 @@ public final class RavenousDemon extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Human"); static { - filter.add(new SubtypePredicate(SubType.HUMAN)); + filter.add(SubType.HUMAN.getPredicate()); } public RavenousDemon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/ReachOfBranches.java b/Mage.Sets/src/mage/cards/r/ReachOfBranches.java index 6efdf82151..a4f5fa8db7 100644 --- a/Mage.Sets/src/mage/cards/r/ReachOfBranches.java +++ b/Mage.Sets/src/mage/cards/r/ReachOfBranches.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.TreefolkShamanToken; @@ -26,7 +25,7 @@ public final class ReachOfBranches extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public ReachOfBranches(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RealmCloakedGiant.java b/Mage.Sets/src/mage/cards/r/RealmCloakedGiant.java index 091d45b1d8..3357497396 100644 --- a/Mage.Sets/src/mage/cards/r/RealmCloakedGiant.java +++ b/Mage.Sets/src/mage/cards/r/RealmCloakedGiant.java @@ -9,7 +9,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -22,7 +21,7 @@ public final class RealmCloakedGiant extends AdventureCard { = new FilterCreaturePermanent("non-Giant creatures"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.GIANT))); + filter.add(Predicates.not(SubType.GIANT.getPredicate())); } public RealmCloakedGiant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/ReaperFromTheAbyss.java b/Mage.Sets/src/mage/cards/r/ReaperFromTheAbyss.java index 519ff15bcc..dfa2962adb 100644 --- a/Mage.Sets/src/mage/cards/r/ReaperFromTheAbyss.java +++ b/Mage.Sets/src/mage/cards/r/ReaperFromTheAbyss.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -32,7 +31,7 @@ public final class ReaperFromTheAbyss extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Demon creature"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.DEMON))); + filter.add(Predicates.not(SubType.DEMON.getPredicate())); } public ReaperFromTheAbyss(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/ReaperKing.java b/Mage.Sets/src/mage/cards/r/ReaperKing.java index e3d65bef51..b466bbf093 100644 --- a/Mage.Sets/src/mage/cards/r/ReaperKing.java +++ b/Mage.Sets/src/mage/cards/r/ReaperKing.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.TargetPermanent; @@ -26,9 +25,9 @@ public final class ReaperKing extends CardImpl { private static final FilterCreaturePermanent filterTrigger = new FilterCreaturePermanent("another Scarecrow"); static { - filter.add(new SubtypePredicate(SubType.SCARECROW)); + filter.add(SubType.SCARECROW.getPredicate()); filterTrigger.add(AnotherPredicate.instance); - filterTrigger.add(new SubtypePredicate(SubType.SCARECROW)); + filterTrigger.add(SubType.SCARECROW.getPredicate()); } public ReaperKing(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RebelInformer.java b/Mage.Sets/src/mage/cards/r/RebelInformer.java index 1bfcbcae63..7c7d7cd4a2 100644 --- a/Mage.Sets/src/mage/cards/r/RebelInformer.java +++ b/Mage.Sets/src/mage/cards/r/RebelInformer.java @@ -21,7 +21,6 @@ import mage.filter.FilterPermanent; import mage.filter.FilterStackObject; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.target.TargetPermanent; @@ -37,7 +36,7 @@ public final class RebelInformer extends CardImpl { static { filterWhite.add(new ColorPredicate(ObjectColor.WHITE)); filterRebel.add(Predicates.not(TokenPredicate.instance)); - filterRebel.add(new SubtypePredicate(SubType.REBEL)); + filterRebel.add(SubType.REBEL.getPredicate()); } public RebelInformer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RecklessCohort.java b/Mage.Sets/src/mage/cards/r/RecklessCohort.java index a4f00f9e92..4d218f4456 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessCohort.java +++ b/Mage.Sets/src/mage/cards/r/RecklessCohort.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -25,7 +24,7 @@ public final class RecklessCohort extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); } public RecklessCohort(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RecklessOne.java b/Mage.Sets/src/mage/cards/r/RecklessOne.java index 4ce1de6dfa..46373eecb2 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessOne.java +++ b/Mage.Sets/src/mage/cards/r/RecklessOne.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -25,7 +24,7 @@ public final class RecklessOne extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Goblins on the battlefield"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public RecklessOne(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RedcapRaiders.java b/Mage.Sets/src/mage/cards/r/RedcapRaiders.java index 876af13159..cb765f07a2 100644 --- a/Mage.Sets/src/mage/cards/r/RedcapRaiders.java +++ b/Mage.Sets/src/mage/cards/r/RedcapRaiders.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -31,7 +30,7 @@ public final class RedcapRaiders extends CardImpl { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(Predicates.not(new SubtypePredicate(SubType.HUMAN))); + filter.add(Predicates.not(SubType.HUMAN.getPredicate())); } public RedcapRaiders(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/ReflexSliver.java b/Mage.Sets/src/mage/cards/r/ReflexSliver.java index 6f32d9d167..63e54a167b 100644 --- a/Mage.Sets/src/mage/cards/r/ReflexSliver.java +++ b/Mage.Sets/src/mage/cards/r/ReflexSliver.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class ReflexSliver extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); } public ReflexSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RefreshingRain.java b/Mage.Sets/src/mage/cards/r/RefreshingRain.java index 038c187b5a..5f0ed6d210 100644 --- a/Mage.Sets/src/mage/cards/r/RefreshingRain.java +++ b/Mage.Sets/src/mage/cards/r/RefreshingRain.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPlayer; /** @@ -26,8 +25,8 @@ public final class RefreshingRain extends CardImpl { private static final FilterPermanent filterSwamp = new FilterPermanent(); static { - filterForest.add(new SubtypePredicate(SubType.FOREST)); - filterSwamp.add(new SubtypePredicate(SubType.SWAMP)); + filterForest.add(SubType.FOREST.getPredicate()); + filterSwamp.add(SubType.SWAMP.getPredicate()); } public RefreshingRain(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RegalCaracal.java b/Mage.Sets/src/mage/cards/r/RegalCaracal.java index d8a9f63678..e6340e1a4e 100644 --- a/Mage.Sets/src/mage/cards/r/RegalCaracal.java +++ b/Mage.Sets/src/mage/cards/r/RegalCaracal.java @@ -15,7 +15,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.CatToken2; @@ -28,7 +27,7 @@ public final class RegalCaracal extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Cats"); static { - filter.add(new SubtypePredicate(SubType.CAT)); + filter.add(SubType.CAT.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/r/RegisaurAlpha.java b/Mage.Sets/src/mage/cards/r/RegisaurAlpha.java index cdfbe67a90..03180cd05d 100644 --- a/Mage.Sets/src/mage/cards/r/RegisaurAlpha.java +++ b/Mage.Sets/src/mage/cards/r/RegisaurAlpha.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.DinosaurToken; @@ -29,7 +28,7 @@ public final class RegisaurAlpha extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Dinosaurs"); static { - filter.add(new SubtypePredicate(SubType.DINOSAUR)); + filter.add(SubType.DINOSAUR.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/r/ReignOfChaos.java b/Mage.Sets/src/mage/cards/r/ReignOfChaos.java index 0688a7bd83..bfc2e60afc 100644 --- a/Mage.Sets/src/mage/cards/r/ReignOfChaos.java +++ b/Mage.Sets/src/mage/cards/r/ReignOfChaos.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -27,9 +26,9 @@ public final class ReignOfChaos extends CardImpl { private static final FilterCreaturePermanent filter4 = new FilterCreaturePermanent("blue creature"); static { - filter1.add(new SubtypePredicate(SubType.PLAINS)); + filter1.add(SubType.PLAINS.getPredicate()); filter2.add(new ColorPredicate(ObjectColor.WHITE)); - filter3.add(new SubtypePredicate(SubType.ISLAND)); + filter3.add(SubType.ISLAND.getPredicate()); filter4.add(new ColorPredicate(ObjectColor.BLUE)); } diff --git a/Mage.Sets/src/mage/cards/r/ReinsOfTheVinesteed.java b/Mage.Sets/src/mage/cards/r/ReinsOfTheVinesteed.java index 46c76b96bf..cbc7f17fcb 100644 --- a/Mage.Sets/src/mage/cards/r/ReinsOfTheVinesteed.java +++ b/Mage.Sets/src/mage/cards/r/ReinsOfTheVinesteed.java @@ -19,7 +19,6 @@ import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -87,7 +86,7 @@ class ReinsOfTheVinesteedEffect extends OneShotEffect { StringBuilder sb = new StringBuilder("creature that shares a creature type with the formerly attached creature: "); List> subtypes = new ArrayList<>(); for (SubType subtype : lastStateCreature.getSubtype(game)) { - subtypes.add(new SubtypePredicate(subtype)); + subtypes.add(subtype.getPredicate()); sb.append(subtype).append(", "); } FILTER.add(Predicates.or(subtypes)); diff --git a/Mage.Sets/src/mage/cards/r/RelentlessDead.java b/Mage.Sets/src/mage/cards/r/RelentlessDead.java index f8e6493341..063fd464b5 100644 --- a/Mage.Sets/src/mage/cards/r/RelentlessDead.java +++ b/Mage.Sets/src/mage/cards/r/RelentlessDead.java @@ -15,7 +15,6 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.AnotherCardPredicate; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInYourGraveyard; @@ -78,7 +77,7 @@ class RelentlessDeadEffect extends OneShotEffect { int payCount = ManaUtil.playerPaysXGenericMana(true, "Relentless Dead", controller, source, game); // can be 0 FilterCard filter = new FilterCard("Another target Zombie card with converted mana cost {" + payCount + "}"); - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, payCount)); filter.add(new AnotherCardPredicate()); TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(filter); diff --git a/Mage.Sets/src/mage/cards/r/RelicSeeker.java b/Mage.Sets/src/mage/cards/r/RelicSeeker.java index 14ec414583..6b37243632 100644 --- a/Mage.Sets/src/mage/cards/r/RelicSeeker.java +++ b/Mage.Sets/src/mage/cards/r/RelicSeeker.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -24,7 +23,7 @@ public final class RelicSeeker extends CardImpl { static { filter.add(CardType.ARTIFACT.getPredicate()); - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); } public RelicSeeker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RemoveEnchantments.java b/Mage.Sets/src/mage/cards/r/RemoveEnchantments.java index 6828490c7f..7c077c4b15 100644 --- a/Mage.Sets/src/mage/cards/r/RemoveEnchantments.java +++ b/Mage.Sets/src/mage/cards/r/RemoveEnchantments.java @@ -13,7 +13,6 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledEnchantmentPermanent; import mage.filter.predicate.ObjectPlayer; import mage.filter.predicate.ObjectPlayerPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.AttachedToControlledPermanentPredicate; import mage.game.Game; @@ -36,21 +35,21 @@ public final class RemoveEnchantments extends CardImpl { filter1.add(new OwnerPredicate(TargetController.YOU)); // all Auras you own attached to permanents you control filter2.add(new AttachedToControlledPermanentPredicate()); - filter2.add(new SubtypePredicate(SubType.AURA)); + filter2.add(SubType.AURA.getPredicate()); filter2.add(new OwnerPredicate(TargetController.YOU)); // all Auras you own attached to attacking creatures your opponents control filter3.add(new AttachedToOpponentControlledAttackingCreaturePredicate()); - filter3.add(new SubtypePredicate(SubType.AURA)); + filter3.add(SubType.AURA.getPredicate()); filter3.add(new OwnerPredicate(TargetController.YOU)); // all other enchantments you control (i.e. that you don't own) filter4.add(new OwnerPredicate(TargetController.NOT_YOU)); // all other Auras attached to permanents you control (i.e. that you don't own) filter5.add(new AttachedToControlledPermanentPredicate()); - filter5.add(new SubtypePredicate(SubType.AURA)); + filter5.add(SubType.AURA.getPredicate()); filter5.add(new OwnerPredicate(TargetController.NOT_YOU)); // all other Auras attached to attacking creatures your opponents control (i.e. that you don't own) filter6.add(new AttachedToOpponentControlledAttackingCreaturePredicate()); - filter6.add(new SubtypePredicate(SubType.AURA)); + filter6.add(SubType.AURA.getPredicate()); filter6.add(new OwnerPredicate(TargetController.NOT_YOU)); } diff --git a/Mage.Sets/src/mage/cards/r/RendFlesh.java b/Mage.Sets/src/mage/cards/r/RendFlesh.java index 44dd50d7d9..2ccee11399 100644 --- a/Mage.Sets/src/mage/cards/r/RendFlesh.java +++ b/Mage.Sets/src/mage/cards/r/RendFlesh.java @@ -9,7 +9,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; @@ -23,7 +22,7 @@ public final class RendFlesh extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Non-Spirit creature"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.SPIRIT))); + filter.add(Predicates.not(SubType.SPIRIT.getPredicate())); } public RendFlesh(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RendSpirit.java b/Mage.Sets/src/mage/cards/r/RendSpirit.java index b9ea47e42a..bb5e14ec7d 100644 --- a/Mage.Sets/src/mage/cards/r/RendSpirit.java +++ b/Mage.Sets/src/mage/cards/r/RendSpirit.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -20,7 +19,7 @@ public final class RendSpirit extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Spirit"); static { - filter.add(new SubtypePredicate(SubType.SPIRIT)); + filter.add(SubType.SPIRIT.getPredicate()); } public RendSpirit(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RenegadeFirebrand.java b/Mage.Sets/src/mage/cards/r/RenegadeFirebrand.java index 55df96242d..1c62718d58 100644 --- a/Mage.Sets/src/mage/cards/r/RenegadeFirebrand.java +++ b/Mage.Sets/src/mage/cards/r/RenegadeFirebrand.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -30,7 +29,7 @@ public final class RenegadeFirebrand extends CardImpl { static { filter.add(CardType.PLANESWALKER.getPredicate()); - filter.add(new SubtypePredicate(SubType.CHANDRA)); + filter.add(SubType.CHANDRA.getPredicate()); } public RenegadeFirebrand(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RenewingDawn.java b/Mage.Sets/src/mage/cards/r/RenewingDawn.java index 6f7207315e..bd2a1fed84 100644 --- a/Mage.Sets/src/mage/cards/r/RenewingDawn.java +++ b/Mage.Sets/src/mage/cards/r/RenewingDawn.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetOpponent; /** @@ -24,7 +23,7 @@ public final class RenewingDawn extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Mountain"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public RenewingDawn(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RepelTheAbominable.java b/Mage.Sets/src/mage/cards/r/RepelTheAbominable.java index 1f0ce1da0c..a712f72df5 100644 --- a/Mage.Sets/src/mage/cards/r/RepelTheAbominable.java +++ b/Mage.Sets/src/mage/cards/r/RepelTheAbominable.java @@ -10,7 +10,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterObject; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -21,7 +20,7 @@ public final class RepelTheAbominable extends CardImpl { private static final FilterObject filter = new FilterObject("non-Human sources"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.HUMAN))); + filter.add(Predicates.not(SubType.HUMAN.getPredicate())); } public RepelTheAbominable(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RequiemAngel.java b/Mage.Sets/src/mage/cards/r/RequiemAngel.java index 178164eab7..711b026392 100644 --- a/Mage.Sets/src/mage/cards/r/RequiemAngel.java +++ b/Mage.Sets/src/mage/cards/r/RequiemAngel.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.SpiritWhiteToken; @@ -26,7 +25,7 @@ public final class RequiemAngel extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another non-Spirit creature you control"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.SPIRIT))); + filter.add(Predicates.not(SubType.SPIRIT.getPredicate())); filter.add(AnotherPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/r/RestorationAngel.java b/Mage.Sets/src/mage/cards/r/RestorationAngel.java index 6a4942c387..5efb437727 100644 --- a/Mage.Sets/src/mage/cards/r/RestorationAngel.java +++ b/Mage.Sets/src/mage/cards/r/RestorationAngel.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -33,7 +32,7 @@ public final class RestorationAngel extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("non-Angel creature you control"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.ANGEL))); + filter.add(Predicates.not(SubType.ANGEL.getPredicate())); } public RestorationAngel(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/Retether.java b/Mage.Sets/src/mage/cards/r/Retether.java index 0659f965ff..54a4f1d8ca 100644 --- a/Mage.Sets/src/mage/cards/r/Retether.java +++ b/Mage.Sets/src/mage/cards/r/Retether.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.CanBeEnchantedByPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -53,7 +52,7 @@ class RetetherEffect extends OneShotEffect { static { filterAura.add(CardType.ENCHANTMENT.getPredicate()); - filterAura.add(new SubtypePredicate(SubType.AURA)); + filterAura.add(SubType.AURA.getPredicate()); } public RetetherEffect() { diff --git a/Mage.Sets/src/mage/cards/r/RetrofitterFoundry.java b/Mage.Sets/src/mage/cards/r/RetrofitterFoundry.java index 56c55ec9f0..e6f66162a0 100644 --- a/Mage.Sets/src/mage/cards/r/RetrofitterFoundry.java +++ b/Mage.Sets/src/mage/cards/r/RetrofitterFoundry.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.RetrofitterFoundryToken; import mage.game.permanent.token.ServoToken; import mage.game.permanent.token.ThopterColorlessToken; @@ -30,8 +29,8 @@ public final class RetrofitterFoundry extends CardImpl { private static final FilterControlledPermanent filter2 = new FilterControlledPermanent("a Thopter"); static { - filter1.add(new SubtypePredicate(SubType.SERVO)); - filter2.add(new SubtypePredicate(SubType.THOPTER)); + filter1.add(SubType.SERVO.getPredicate()); + filter2.add(SubType.THOPTER.getPredicate()); } public RetrofitterFoundry(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/ReturnOfTheNightstalkers.java b/Mage.Sets/src/mage/cards/r/ReturnOfTheNightstalkers.java index 815d3a954f..3f026a7d73 100644 --- a/Mage.Sets/src/mage/cards/r/ReturnOfTheNightstalkers.java +++ b/Mage.Sets/src/mage/cards/r/ReturnOfTheNightstalkers.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -46,8 +45,8 @@ class ReturnOfTheNightstalkersEffect extends OneShotEffect { private static final FilterControlledPermanent filter2 = new FilterControlledPermanent(); static { - filter1.add(new SubtypePredicate(SubType.NIGHTSTALKER)); - filter2.add(new SubtypePredicate(SubType.SWAMP)); + filter1.add(SubType.NIGHTSTALKER.getPredicate()); + filter2.add(SubType.SWAMP.getPredicate()); } public ReturnOfTheNightstalkersEffect() { diff --git a/Mage.Sets/src/mage/cards/r/ReturnOfTheWildspeaker.java b/Mage.Sets/src/mage/cards/r/ReturnOfTheWildspeaker.java index ea0ae6927e..840bc2aeab 100644 --- a/Mage.Sets/src/mage/cards/r/ReturnOfTheWildspeaker.java +++ b/Mage.Sets/src/mage/cards/r/ReturnOfTheWildspeaker.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -29,7 +28,7 @@ public final class ReturnOfTheWildspeaker extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Human creatures"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.HUMAN))); + filter.add(Predicates.not(SubType.HUMAN.getPredicate())); } public ReturnOfTheWildspeaker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RevelInRiches.java b/Mage.Sets/src/mage/cards/r/RevelInRiches.java index bdd47cd8c0..e26d2b28ac 100644 --- a/Mage.Sets/src/mage/cards/r/RevelInRiches.java +++ b/Mage.Sets/src/mage/cards/r/RevelInRiches.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.TreasureToken; @@ -32,7 +31,7 @@ public final class RevelInRiches extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); - filter2.add(new SubtypePredicate(SubType.TREASURE)); + filter2.add(SubType.TREASURE.getPredicate()); } public RevelInRiches(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/ReverentSilence.java b/Mage.Sets/src/mage/cards/r/ReverentSilence.java index dfe6f43753..0cd2694ab8 100644 --- a/Mage.Sets/src/mage/cards/r/ReverentSilence.java +++ b/Mage.Sets/src/mage/cards/r/ReverentSilence.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterEnchantmentPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -23,7 +22,7 @@ public final class ReverentSilence extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("If you control a Forest"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public ReverentSilence(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RhoxPikemaster.java b/Mage.Sets/src/mage/cards/r/RhoxPikemaster.java index 780d1e96f1..5a1f243e8b 100644 --- a/Mage.Sets/src/mage/cards/r/RhoxPikemaster.java +++ b/Mage.Sets/src/mage/cards/r/RhoxPikemaster.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -25,7 +24,7 @@ public final class RhoxPikemaster extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Soldier creatures"); static { - filter.add(new SubtypePredicate(SubType.SOLDIER)); + filter.add(SubType.SOLDIER.getPredicate()); } public RhoxPikemaster(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RhysTheExiled.java b/Mage.Sets/src/mage/cards/r/RhysTheExiled.java index 11b690bf6f..083858601f 100644 --- a/Mage.Sets/src/mage/cards/r/RhysTheExiled.java +++ b/Mage.Sets/src/mage/cards/r/RhysTheExiled.java @@ -15,7 +15,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -27,8 +26,8 @@ public final class RhysTheExiled extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Elf"); private static final FilterControlledCreaturePermanent filter2 = new FilterControlledCreaturePermanent("Elf you control"); static { - filter.add(new SubtypePredicate(SubType.ELF)); - filter2.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); + filter2.add(SubType.ELF.getPredicate()); } public RhysTheExiled(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RibbonsOfTheReikai.java b/Mage.Sets/src/mage/cards/r/RibbonsOfTheReikai.java index b33e39f36f..8d46b2ec65 100644 --- a/Mage.Sets/src/mage/cards/r/RibbonsOfTheReikai.java +++ b/Mage.Sets/src/mage/cards/r/RibbonsOfTheReikai.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -20,7 +19,7 @@ public final class RibbonsOfTheReikai extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Spirit you control"); static { - filter.add(new SubtypePredicate(SubType.SPIRIT)); + filter.add(SubType.SPIRIT.getPredicate()); } public RibbonsOfTheReikai(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RidersOfGavony.java b/Mage.Sets/src/mage/cards/r/RidersOfGavony.java index 0fc541dfe5..47676257ec 100644 --- a/Mage.Sets/src/mage/cards/r/RidersOfGavony.java +++ b/Mage.Sets/src/mage/cards/r/RidersOfGavony.java @@ -15,7 +15,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -56,7 +55,7 @@ class RidersOfGavonyGainAbilityControlledEffect extends ContinuousEffectImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Human creatures you control"); static { - filter.add(new SubtypePredicate(SubType.HUMAN)); + filter.add(SubType.HUMAN.getPredicate()); } protected FilterPermanent protectionFilter; @@ -84,7 +83,7 @@ class RidersOfGavonyGainAbilityControlledEffect extends ContinuousEffectImpl { SubType subType = ChooseCreatureTypeEffect.getChosenCreatureType(permanent.getId(), game); if (subType != null) { protectionFilter = new FilterPermanent(subType.getDescription() + 's'); - protectionFilter.add(new SubtypePredicate(subType)); + protectionFilter.add(subType.getPredicate()); } else { discard(); } diff --git a/Mage.Sets/src/mage/cards/r/RimeDryad.java b/Mage.Sets/src/mage/cards/r/RimeDryad.java index 27f6766ac9..0153744d26 100644 --- a/Mage.Sets/src/mage/cards/r/RimeDryad.java +++ b/Mage.Sets/src/mage/cards/r/RimeDryad.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; /** @@ -23,7 +22,7 @@ public final class RimeDryad extends CardImpl { static { filter.add(new SupertypePredicate(SuperType.SNOW)); - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public RimeDryad(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RingOfImmortals.java b/Mage.Sets/src/mage/cards/r/RingOfImmortals.java index 0e788e85c6..3cc4745603 100644 --- a/Mage.Sets/src/mage/cards/r/RingOfImmortals.java +++ b/Mage.Sets/src/mage/cards/r/RingOfImmortals.java @@ -15,7 +15,6 @@ import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.other.TargetsPermanentPredicate; import mage.target.TargetSpell; @@ -28,7 +27,7 @@ public final class RingOfImmortals extends CardImpl { private static final FilterSpell filter = new FilterSpell("instant or Aura spell that targets a permanent you control"); static { - filter.add(Predicates.or(CardType.INSTANT.getPredicate(), new SubtypePredicate(SubType.AURA))); + filter.add(Predicates.or(CardType.INSTANT.getPredicate(), SubType.AURA.getPredicate())); filter.add(new TargetsPermanentPredicate(new FilterControlledPermanent())); } diff --git a/Mage.Sets/src/mage/cards/r/RiotRingleader.java b/Mage.Sets/src/mage/cards/r/RiotRingleader.java index 7e513d30e1..059ef7472d 100644 --- a/Mage.Sets/src/mage/cards/r/RiotRingleader.java +++ b/Mage.Sets/src/mage/cards/r/RiotRingleader.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class RiotRingleader extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Human creatures"); static { - filter.add(new SubtypePredicate(SubType.HUMAN)); + filter.add(SubType.HUMAN.getPredicate()); } public RiotRingleader(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RiotTrooper.java b/Mage.Sets/src/mage/cards/r/RiotTrooper.java index 47e14b1107..24dd108c0a 100644 --- a/Mage.Sets/src/mage/cards/r/RiotTrooper.java +++ b/Mage.Sets/src/mage/cards/r/RiotTrooper.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class RiotTrooper extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("trooper creatures you control"); static { - filter.add(new SubtypePredicate(SubType.TROOPER)); + filter.add(SubType.TROOPER.getPredicate()); } public RiotTrooper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RiptideBiologist.java b/Mage.Sets/src/mage/cards/r/RiptideBiologist.java index b5c3c28132..94f7e821ec 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideBiologist.java +++ b/Mage.Sets/src/mage/cards/r/RiptideBiologist.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class RiptideBiologist extends CardImpl { private static final FilterCard filter = new FilterCard("Beasts"); static { - filter.add(new SubtypePredicate(SubType.BEAST)); + filter.add(SubType.BEAST.getPredicate()); } public RiptideBiologist(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RiptideChronologist.java b/Mage.Sets/src/mage/cards/r/RiptideChronologist.java index 6149c2b7bd..42f4d119e8 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideChronologist.java +++ b/Mage.Sets/src/mage/cards/r/RiptideChronologist.java @@ -18,7 +18,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -71,7 +70,7 @@ class RiptideChronologistEffect extends OneShotEffect { if (player.choose(outcome, typeChoice, game)) { game.informPlayers(sourceObject.getLogName() + " chosen type: " + typeChoice.getChoice()); FilterCreaturePermanent filterCreaturePermanent = new FilterCreaturePermanent(); - filterCreaturePermanent.add(new SubtypePredicate(SubType.byDescription(typeChoice.getChoice()))); + filterCreaturePermanent.add(SubType.byDescription(typeChoice.getChoice()).getPredicate()); for (Permanent creature : game.getBattlefield().getActivePermanents(filterCreaturePermanent, source.getSourceId(), game)) { creature.untap(game); } diff --git a/Mage.Sets/src/mage/cards/r/RiptideDirector.java b/Mage.Sets/src/mage/cards/r/RiptideDirector.java index 71b0ced24e..c22fedbb85 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideDirector.java +++ b/Mage.Sets/src/mage/cards/r/RiptideDirector.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -27,7 +26,7 @@ public final class RiptideDirector extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledCreaturePermanent("Wizard you control"); static { - filter.add(new SubtypePredicate(SubType.WIZARD)); + filter.add(SubType.WIZARD.getPredicate()); } public RiptideDirector(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RiptideLaboratory.java b/Mage.Sets/src/mage/cards/r/RiptideLaboratory.java index 049835c8ed..ea78130e23 100644 --- a/Mage.Sets/src/mage/cards/r/RiptideLaboratory.java +++ b/Mage.Sets/src/mage/cards/r/RiptideLaboratory.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -26,7 +25,7 @@ public final class RiptideLaboratory extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Wizard you control"); static { - filter.add(new SubtypePredicate(SubType.WIZARD)); + filter.add(SubType.WIZARD.getPredicate()); } public RiptideLaboratory(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RiseToGlory.java b/Mage.Sets/src/mage/cards/r/RiseToGlory.java index 9ba6183697..55e915dffe 100644 --- a/Mage.Sets/src/mage/cards/r/RiseToGlory.java +++ b/Mage.Sets/src/mage/cards/r/RiseToGlory.java @@ -8,7 +8,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.StaticFilters; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInYourGraveyard; import java.util.UUID; @@ -21,7 +20,7 @@ public final class RiseToGlory extends CardImpl { private static final FilterCard filter = new FilterCard("Aura card from your graveyard"); static { - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); } public RiseToGlory(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RisenExecutioner.java b/Mage.Sets/src/mage/cards/r/RisenExecutioner.java index 40c1b4c799..f1b824e313 100644 --- a/Mage.Sets/src/mage/cards/r/RisenExecutioner.java +++ b/Mage.Sets/src/mage/cards/r/RisenExecutioner.java @@ -16,7 +16,6 @@ import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AnotherCardPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.stack.Spell; import mage.players.Player; @@ -31,7 +30,7 @@ public final class RisenExecutioner extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Zombie creatures"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public RisenExecutioner(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RithsGrove.java b/Mage.Sets/src/mage/cards/r/RithsGrove.java index 511d5094fc..cea3aa9474 100644 --- a/Mage.Sets/src/mage/cards/r/RithsGrove.java +++ b/Mage.Sets/src/mage/cards/r/RithsGrove.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import java.util.UUID; @@ -26,7 +25,7 @@ public final class RithsGrove extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("non-Lair land"); static{ - filter.add(Predicates.not(new SubtypePredicate(SubType.LAIR))); + filter.add(Predicates.not(SubType.LAIR.getPredicate())); } public RithsGrove(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RiverSneak.java b/Mage.Sets/src/mage/cards/r/RiverSneak.java index ce86dc98cf..cab1be8da0 100644 --- a/Mage.Sets/src/mage/cards/r/RiverSneak.java +++ b/Mage.Sets/src/mage/cards/r/RiverSneak.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -29,7 +28,7 @@ public final class RiverSneak extends CardImpl { static { filter.add(AnotherPredicate.instance); filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.MERFOLK)); + filter.add(SubType.MERFOLK.getPredicate()); } public RiverSneak(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RoarOfJukai.java b/Mage.Sets/src/mage/cards/r/RoarOfJukai.java index 0945b7fbdf..6d777a3cae 100644 --- a/Mage.Sets/src/mage/cards/r/RoarOfJukai.java +++ b/Mage.Sets/src/mage/cards/r/RoarOfJukai.java @@ -16,7 +16,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.BlockedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -58,7 +57,7 @@ class RoarOfJukaiEffect extends OneShotEffect { private static final FilterCreaturePermanent filterBlocked = new FilterCreaturePermanent("blocked creature"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); filterBlocked.add(BlockedPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/r/RoarOfTheCrowd.java b/Mage.Sets/src/mage/cards/r/RoarOfTheCrowd.java index ae92c3f7f7..bdb4404c4f 100644 --- a/Mage.Sets/src/mage/cards/r/RoarOfTheCrowd.java +++ b/Mage.Sets/src/mage/cards/r/RoarOfTheCrowd.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetAnyTarget; @@ -68,7 +67,7 @@ class RoarOfTheCrowdEffect extends OneShotEffect { return false; } FilterControlledPermanent filter = new FilterControlledPermanent(); - filter.add(new SubtypePredicate(SubType.byDescription(typeChoice.getChoice()))); + filter.add(SubType.byDescription(typeChoice.getChoice()).getPredicate()); return new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)).apply(game, source); } return false; diff --git a/Mage.Sets/src/mage/cards/r/RockBasilisk.java b/Mage.Sets/src/mage/cards/r/RockBasilisk.java index ce18b384a8..6fef87b86b 100644 --- a/Mage.Sets/src/mage/cards/r/RockBasilisk.java +++ b/Mage.Sets/src/mage/cards/r/RockBasilisk.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -25,7 +24,7 @@ public final class RockBasilisk extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Wall creature"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.WALL))); + filter.add(Predicates.not(SubType.WALL.getPredicate())); } public RockBasilisk(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RockslideAmbush.java b/Mage.Sets/src/mage/cards/r/RockslideAmbush.java index f07e54802e..79e0c3df48 100644 --- a/Mage.Sets/src/mage/cards/r/RockslideAmbush.java +++ b/Mage.Sets/src/mage/cards/r/RockslideAmbush.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -21,7 +20,7 @@ public final class RockslideAmbush extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Mountain you control"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public RockslideAmbush(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RofellosLlanowarEmissary.java b/Mage.Sets/src/mage/cards/r/RofellosLlanowarEmissary.java index ceb5d13a52..ff46d29952 100644 --- a/Mage.Sets/src/mage/cards/r/RofellosLlanowarEmissary.java +++ b/Mage.Sets/src/mage/cards/r/RofellosLlanowarEmissary.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class RofellosLlanowarEmissary extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("for each Forest you control"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public RofellosLlanowarEmissary(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RogueElephant.java b/Mage.Sets/src/mage/cards/r/RogueElephant.java index 35968b1037..1a933d6571 100644 --- a/Mage.Sets/src/mage/cards/r/RogueElephant.java +++ b/Mage.Sets/src/mage/cards/r/RogueElephant.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -23,7 +22,7 @@ public final class RogueElephant extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("a Forest"); static{ - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public RogueElephant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RollingStones.java b/Mage.Sets/src/mage/cards/r/RollingStones.java index d7d9d41a1f..73e8968649 100644 --- a/Mage.Sets/src/mage/cards/r/RollingStones.java +++ b/Mage.Sets/src/mage/cards/r/RollingStones.java @@ -11,7 +11,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class RollingStones extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Wall creatures"); static { - filter.add(new SubtypePredicate(SubType.WALL)); + filter.add(SubType.WALL.getPredicate()); } public RollingStones(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RooftopStorm.java b/Mage.Sets/src/mage/cards/r/RooftopStorm.java index 23b6a210de..0b82329db9 100644 --- a/Mage.Sets/src/mage/cards/r/RooftopStorm.java +++ b/Mage.Sets/src/mage/cards/r/RooftopStorm.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; @@ -45,7 +44,7 @@ class RooftopStormRuleEffect extends ContinuousEffectImpl { private static final FilterCard filter = new FilterCard("Zombie creature spells"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); filter.add(CardType.CREATURE.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/r/RootCage.java b/Mage.Sets/src/mage/cards/r/RootCage.java index 4b170c723b..dd003e3b42 100644 --- a/Mage.Sets/src/mage/cards/r/RootCage.java +++ b/Mage.Sets/src/mage/cards/r/RootCage.java @@ -8,7 +8,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -19,7 +18,7 @@ public final class RootCage extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Mercenaries"); static { - filter.add(new SubtypePredicate(SubType.MERCENARY)); + filter.add(SubType.MERCENARY.getPredicate()); } public RootCage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RootSliver.java b/Mage.Sets/src/mage/cards/r/RootSliver.java index 69c57f6a76..e6ee64a1b5 100644 --- a/Mage.Sets/src/mage/cards/r/RootSliver.java +++ b/Mage.Sets/src/mage/cards/r/RootSliver.java @@ -16,7 +16,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.stack.Spell; @@ -31,7 +30,7 @@ public final class RootSliver extends CardImpl { private static final FilterSpell filter = new FilterSpell("Sliver spells"); static { - filter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); } public RootSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RootboundCrag.java b/Mage.Sets/src/mage/cards/r/RootboundCrag.java index c327ada2e2..20cce5cef5 100644 --- a/Mage.Sets/src/mage/cards/r/RootboundCrag.java +++ b/Mage.Sets/src/mage/cards/r/RootboundCrag.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -28,7 +27,7 @@ public final class RootboundCrag extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.MOUNTAIN), new SubtypePredicate(SubType.FOREST))); + filter.add(Predicates.or(SubType.MOUNTAIN.getPredicate(), SubType.FOREST.getPredicate())); } public RootboundCrag(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/Rootgrapple.java b/Mage.Sets/src/mage/cards/r/Rootgrapple.java index 023e9fe948..aae8d7cddb 100644 --- a/Mage.Sets/src/mage/cards/r/Rootgrapple.java +++ b/Mage.Sets/src/mage/cards/r/Rootgrapple.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import java.util.UUID; @@ -27,7 +26,7 @@ public final class Rootgrapple extends CardImpl { static { filterNoncreature.add(Predicates.not(CardType.CREATURE.getPredicate())); - filterTreefolk.add(new SubtypePredicate(SubType.TREEFOLK)); + filterTreefolk.add(SubType.TREEFOLK.getPredicate()); } public Rootgrapple(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RootsOfLife.java b/Mage.Sets/src/mage/cards/r/RootsOfLife.java index c3f2cba6d6..c816419465 100644 --- a/Mage.Sets/src/mage/cards/r/RootsOfLife.java +++ b/Mage.Sets/src/mage/cards/r/RootsOfLife.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -29,9 +28,9 @@ public final class RootsOfLife extends CardImpl { private static final FilterPermanent swampFilter = new FilterPermanent("a Swamp an opponent controls"); static { - islandFilter.add(new SubtypePredicate(SubType.ISLAND)); + islandFilter.add(SubType.ISLAND.getPredicate()); islandFilter.add(new ControllerPredicate(TargetController.OPPONENT)); - swampFilter.add(new SubtypePredicate(SubType.SWAMP)); + swampFilter.add(SubType.SWAMP.getPredicate()); swampFilter.add(new ControllerPredicate(TargetController.OPPONENT)); } diff --git a/Mage.Sets/src/mage/cards/r/RootwaterAlligator.java b/Mage.Sets/src/mage/cards/r/RootwaterAlligator.java index feba79f642..1f96619b1f 100644 --- a/Mage.Sets/src/mage/cards/r/RootwaterAlligator.java +++ b/Mage.Sets/src/mage/cards/r/RootwaterAlligator.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -24,7 +23,7 @@ public final class RootwaterAlligator extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Forest"); static{ - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public RootwaterAlligator(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RootwaterShaman.java b/Mage.Sets/src/mage/cards/r/RootwaterShaman.java index c9359a698e..04083593fa 100644 --- a/Mage.Sets/src/mage/cards/r/RootwaterShaman.java +++ b/Mage.Sets/src/mage/cards/r/RootwaterShaman.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; /** @@ -28,7 +27,7 @@ public final class RootwaterShaman extends CardImpl { private static final FilterCard filter = new FilterCard("Aura spells with enchant creature"); static { - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); filter.add(new RootwaterShamanAbilityPredicate()); } diff --git a/Mage.Sets/src/mage/cards/r/RosethornHalberd.java b/Mage.Sets/src/mage/cards/r/RosethornHalberd.java index ca2c55f834..9daf0525b4 100644 --- a/Mage.Sets/src/mage/cards/r/RosethornHalberd.java +++ b/Mage.Sets/src/mage/cards/r/RosethornHalberd.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import java.util.UUID; @@ -28,7 +27,7 @@ public final class RosethornHalberd extends CardImpl { = new FilterControlledCreaturePermanent("non-Human creature you control"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.HUMAN))); + filter.add(Predicates.not(SubType.HUMAN.getPredicate())); } public RosethornHalberd(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RotHulk.java b/Mage.Sets/src/mage/cards/r/RotHulk.java index 81b82e5526..80599a8dd5 100644 --- a/Mage.Sets/src/mage/cards/r/RotHulk.java +++ b/Mage.Sets/src/mage/cards/r/RotHulk.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.target.common.TargetCardInYourGraveyard; @@ -26,7 +25,7 @@ public final class RotHulk extends CardImpl { private static final FilterCard filterZombie = new FilterCard("Zombie cards from your graveyard"); static { - filterZombie.add(new SubtypePredicate(SubType.ZOMBIE)); + filterZombie.add(SubType.ZOMBIE.getPredicate()); } private final UUID entersBattlefieldAbilityID; diff --git a/Mage.Sets/src/mage/cards/r/RotlungReanimator.java b/Mage.Sets/src/mage/cards/r/RotlungReanimator.java index 024d4da83e..1a820a166e 100644 --- a/Mage.Sets/src/mage/cards/r/RotlungReanimator.java +++ b/Mage.Sets/src/mage/cards/r/RotlungReanimator.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.ZombieToken; /** @@ -22,7 +21,7 @@ public final class RotlungReanimator extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("{this} or another Cleric"); static { - filter.add(new SubtypePredicate(SubType.CLERIC)); + filter.add(SubType.CLERIC.getPredicate()); } public RotlungReanimator(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/Rouse.java b/Mage.Sets/src/mage/cards/r/Rouse.java index 32fc09f5fb..9288303e71 100644 --- a/Mage.Sets/src/mage/cards/r/Rouse.java +++ b/Mage.Sets/src/mage/cards/r/Rouse.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class Rouse extends CardImpl { private static final FilterLandPermanent filterSwamp = new FilterLandPermanent("If you control a Swamp"); static { - filterSwamp.add(new SubtypePredicate(SubType.SWAMP)); + filterSwamp.add(SubType.SWAMP.getPredicate()); } public Rouse(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RoyalDecree.java b/Mage.Sets/src/mage/cards/r/RoyalDecree.java index 31676121e3..b55b0b12f8 100644 --- a/Mage.Sets/src/mage/cards/r/RoyalDecree.java +++ b/Mage.Sets/src/mage/cards/r/RoyalDecree.java @@ -3,7 +3,6 @@ package mage.cards.r; import java.util.UUID; import mage.ObjectColor; -import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.Effect; @@ -17,10 +16,8 @@ import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.targetpointer.FixedTarget; @@ -56,8 +53,8 @@ class RoyalDecreeAbility extends TriggeredAbilityImpl { private static final FilterPermanent filter = new FilterPermanent("a Swamp, Mountain, black permanent, or red permanent"); static { filter.add(Predicates.or( - new SubtypePredicate(SubType.SWAMP), - new SubtypePredicate(SubType.MOUNTAIN), + SubType.SWAMP.getPredicate(), + SubType.MOUNTAIN.getPredicate(), new ColorPredicate(ObjectColor.BLACK), new ColorPredicate(ObjectColor.RED))); } diff --git a/Mage.Sets/src/mage/cards/r/RushOfBattle.java b/Mage.Sets/src/mage/cards/r/RushOfBattle.java index 1001bddb18..1eca2b9019 100644 --- a/Mage.Sets/src/mage/cards/r/RushOfBattle.java +++ b/Mage.Sets/src/mage/cards/r/RushOfBattle.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class RushOfBattle extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); static { - filter.add(new SubtypePredicate(SubType.WARRIOR)); + filter.add(SubType.WARRIOR.getPredicate()); } public RushOfBattle(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RushwoodLegate.java b/Mage.Sets/src/mage/cards/r/RushwoodLegate.java index 6267bdf3d5..6d3b965b50 100644 --- a/Mage.Sets/src/mage/cards/r/RushwoodLegate.java +++ b/Mage.Sets/src/mage/cards/r/RushwoodLegate.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -25,8 +24,8 @@ public final class RushwoodLegate extends CardImpl { private static final FilterPermanent filterForest = new FilterPermanent(); static { - filterForest.add(new SubtypePredicate(SubType.FOREST)); - filterIsland.add(new SubtypePredicate(SubType.ISLAND)); + filterForest.add(SubType.FOREST.getPredicate()); + filterIsland.add(SubType.ISLAND.getPredicate()); } public RushwoodLegate(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RusticClachan.java b/Mage.Sets/src/mage/cards/r/RusticClachan.java index cf3c28bcbd..758f1b23ae 100644 --- a/Mage.Sets/src/mage/cards/r/RusticClachan.java +++ b/Mage.Sets/src/mage/cards/r/RusticClachan.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; /** @@ -25,7 +24,7 @@ public final class RusticClachan extends CardImpl { private static final FilterCard filter = new FilterCard("a Kithkin card from your hand"); static { - filter.add(new SubtypePredicate(SubType.KITHKIN)); + filter.add(SubType.KITHKIN.getPredicate()); } public RusticClachan(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RustsporeRam.java b/Mage.Sets/src/mage/cards/r/RustsporeRam.java index aa2532e38b..73d0bf9629 100644 --- a/Mage.Sets/src/mage/cards/r/RustsporeRam.java +++ b/Mage.Sets/src/mage/cards/r/RustsporeRam.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -23,7 +22,7 @@ public final class RustsporeRam extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Equipment"); static { - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); } public RustsporeRam(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RuthlessKnave.java b/Mage.Sets/src/mage/cards/r/RuthlessKnave.java index fcbae45b42..f44928972b 100644 --- a/Mage.Sets/src/mage/cards/r/RuthlessKnave.java +++ b/Mage.Sets/src/mage/cards/r/RuthlessKnave.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import static mage.filter.StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.TreasureToken; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetControlledPermanent; @@ -30,7 +29,7 @@ public final class RuthlessKnave extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("three Treasures"); static { - filter.add(new SubtypePredicate(SubType.TREASURE)); + filter.add(SubType.TREASURE.getPredicate()); } public RuthlessKnave(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SachiDaughterOfSeshiro.java b/Mage.Sets/src/mage/cards/s/SachiDaughterOfSeshiro.java index 5f393a84da..3667292b2f 100644 --- a/Mage.Sets/src/mage/cards/s/SachiDaughterOfSeshiro.java +++ b/Mage.Sets/src/mage/cards/s/SachiDaughterOfSeshiro.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @author Loki @@ -25,8 +24,8 @@ public final class SachiDaughterOfSeshiro extends CardImpl { private static final FilterPermanent shamanFilter = new FilterPermanent("Shamans"); static { - snakeFilter.add(new SubtypePredicate(SubType.SNAKE)); - shamanFilter.add(new SubtypePredicate(SubType.SHAMAN)); + snakeFilter.add(SubType.SNAKE.getPredicate()); + shamanFilter.add(SubType.SHAMAN.getPredicate()); } public SachiDaughterOfSeshiro(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SacredMesa.java b/Mage.Sets/src/mage/cards/s/SacredMesa.java index d3a31f138b..ac972291d7 100644 --- a/Mage.Sets/src/mage/cards/s/SacredMesa.java +++ b/Mage.Sets/src/mage/cards/s/SacredMesa.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.PegasusToken; import mage.target.common.TargetControlledPermanent; @@ -27,7 +26,7 @@ public final class SacredMesa extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Pegasus"); static { - filter.add(new SubtypePredicate(SubType.PEGASUS)); + filter.add(SubType.PEGASUS.getPredicate()); } public SacredMesa(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SacredWhiteDeer.java b/Mage.Sets/src/mage/cards/s/SacredWhiteDeer.java index 680f64625c..745393ae3f 100644 --- a/Mage.Sets/src/mage/cards/s/SacredWhiteDeer.java +++ b/Mage.Sets/src/mage/cards/s/SacredWhiteDeer.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -29,7 +28,7 @@ public final class SacredWhiteDeer extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(CardType.PLANESWALKER.getPredicate()); - filter.add(new SubtypePredicate(SubType.YANGGU)); + filter.add(SubType.YANGGU.getPredicate()); } public SacredWhiteDeer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SadisticSkymarcher.java b/Mage.Sets/src/mage/cards/s/SadisticSkymarcher.java index b52c4edc41..df1a93d40b 100644 --- a/Mage.Sets/src/mage/cards/s/SadisticSkymarcher.java +++ b/Mage.Sets/src/mage/cards/s/SadisticSkymarcher.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; /** @@ -25,7 +24,7 @@ public final class SadisticSkymarcher extends CardImpl { private static final FilterCard filter = new FilterCard("a Vampire card from your hand"); static { - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); } public SadisticSkymarcher(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SafewrightQuest.java b/Mage.Sets/src/mage/cards/s/SafewrightQuest.java index 3f77bf7b03..6ee3a604d0 100644 --- a/Mage.Sets/src/mage/cards/s/SafewrightQuest.java +++ b/Mage.Sets/src/mage/cards/s/SafewrightQuest.java @@ -9,7 +9,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -21,7 +20,7 @@ public final class SafewrightQuest extends CardImpl { private static final FilterCard filter = new FilterCard("Forest or Plains card"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.FOREST), new SubtypePredicate(SubType.PLAINS))); + filter.add(Predicates.or(SubType.FOREST.getPredicate(), SubType.PLAINS.getPredicate())); } public SafewrightQuest(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SageOfTheFalls.java b/Mage.Sets/src/mage/cards/s/SageOfTheFalls.java index d8acc2ca0a..29ad92531e 100644 --- a/Mage.Sets/src/mage/cards/s/SageOfTheFalls.java +++ b/Mage.Sets/src/mage/cards/s/SageOfTheFalls.java @@ -10,7 +10,6 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -23,7 +22,7 @@ public final class SageOfTheFalls extends CardImpl { = new FilterCreaturePermanent("{this} or another non-Human creature"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.HUMAN))); + filter.add(Predicates.not(SubType.HUMAN.getPredicate())); } public SageOfTheFalls(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SagesDousing.java b/Mage.Sets/src/mage/cards/s/SagesDousing.java index 62989b2340..d3a18b0b9a 100644 --- a/Mage.Sets/src/mage/cards/s/SagesDousing.java +++ b/Mage.Sets/src/mage/cards/s/SagesDousing.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetSpell; /** @@ -24,7 +23,7 @@ public final class SagesDousing extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Wizard"); static { - filter.add(new SubtypePredicate(SubType.WIZARD)); + filter.add(SubType.WIZARD.getPredicate()); } public SagesDousing(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SagesReverie.java b/Mage.Sets/src/mage/cards/s/SagesReverie.java index 8e87cc30f9..c15d7b2fba 100644 --- a/Mage.Sets/src/mage/cards/s/SagesReverie.java +++ b/Mage.Sets/src/mage/cards/s/SagesReverie.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -32,7 +31,7 @@ public final class SagesReverie extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("aura you control that's attached to a creature"); static { - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); filter.add(new SagesReveriePredicate()); } diff --git a/Mage.Sets/src/mage/cards/s/Sanctimony.java b/Mage.Sets/src/mage/cards/s/Sanctimony.java index 57783ed91a..5f87a6edc0 100644 --- a/Mage.Sets/src/mage/cards/s/Sanctimony.java +++ b/Mage.Sets/src/mage/cards/s/Sanctimony.java @@ -11,7 +11,6 @@ import mage.constants.SetTargetPointer; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -24,7 +23,7 @@ public final class Sanctimony extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public Sanctimony(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SanctumSeeker.java b/Mage.Sets/src/mage/cards/s/SanctumSeeker.java index 323666b53e..08d30f94a4 100644 --- a/Mage.Sets/src/mage/cards/s/SanctumSeeker.java +++ b/Mage.Sets/src/mage/cards/s/SanctumSeeker.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class SanctumSeeker extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Vampire you control"); static { - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); } public SanctumSeeker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SandStrangler.java b/Mage.Sets/src/mage/cards/s/SandStrangler.java index 94f5abff92..728771c42f 100644 --- a/Mage.Sets/src/mage/cards/s/SandStrangler.java +++ b/Mage.Sets/src/mage/cards/s/SandStrangler.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -29,8 +28,8 @@ public final class SandStrangler extends CardImpl { private static final FilterCard filterDesertCard = new FilterCard("Desert card"); static { - filterDesertPermanent.add(new SubtypePredicate(SubType.DESERT)); - filterDesertCard.add(new SubtypePredicate(SubType.DESERT)); + filterDesertPermanent.add(SubType.DESERT.getPredicate()); + filterDesertCard.add(SubType.DESERT.getPredicate()); } public SandStrangler(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SandTrooper.java b/Mage.Sets/src/mage/cards/s/SandTrooper.java index 367920eaee..10a0716f14 100644 --- a/Mage.Sets/src/mage/cards/s/SandTrooper.java +++ b/Mage.Sets/src/mage/cards/s/SandTrooper.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class SandTrooper extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Trooper creatures"); static { - filter.add(new SubtypePredicate(SubType.TROOPER )); + filter.add(SubType.TROOPER .getPredicate()); } public SandTrooper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SanguineGlorifier.java b/Mage.Sets/src/mage/cards/s/SanguineGlorifier.java index df998da572..595b23b5fe 100644 --- a/Mage.Sets/src/mage/cards/s/SanguineGlorifier.java +++ b/Mage.Sets/src/mage/cards/s/SanguineGlorifier.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetControlledPermanent; @@ -26,7 +25,7 @@ public final class SanguineGlorifier extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); } public SanguineGlorifier(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SaprazzanLegate.java b/Mage.Sets/src/mage/cards/s/SaprazzanLegate.java index c0d57d7e59..d25cfefa4d 100644 --- a/Mage.Sets/src/mage/cards/s/SaprazzanLegate.java +++ b/Mage.Sets/src/mage/cards/s/SaprazzanLegate.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,8 +25,8 @@ public final class SaprazzanLegate extends CardImpl { private static final FilterPermanent filterIsland = new FilterPermanent(); static { - filterMountain.add(new SubtypePredicate((SubType.MOUNTAIN))); - filterIsland.add(new SubtypePredicate((SubType.ISLAND))); + filterMountain.add(SubType.MOUNTAIN.getPredicate()); + filterIsland.add(SubType.ISLAND.getPredicate()); } public SaprazzanLegate(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SarkhanDragonsoul.java b/Mage.Sets/src/mage/cards/s/SarkhanDragonsoul.java index f75ea89ad5..ec9c01f827 100644 --- a/Mage.Sets/src/mage/cards/s/SarkhanDragonsoul.java +++ b/Mage.Sets/src/mage/cards/s/SarkhanDragonsoul.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetPlayerOrPlaneswalker; @@ -29,7 +28,7 @@ public final class SarkhanDragonsoul extends CardImpl { private static final FilterCreatureCard filter = new FilterCreatureCard("Dragon creature cards"); static { - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } public SarkhanDragonsoul(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SarkhanFireblood.java b/Mage.Sets/src/mage/cards/s/SarkhanFireblood.java index 274afded81..db16f3ff52 100644 --- a/Mage.Sets/src/mage/cards/s/SarkhanFireblood.java +++ b/Mage.Sets/src/mage/cards/s/SarkhanFireblood.java @@ -16,7 +16,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.DragonToken2; /** @@ -28,7 +27,7 @@ public final class SarkhanFireblood extends CardImpl { private static final FilterSpell filter = new FilterSpell("Dragon spells"); static { - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } public SarkhanFireblood(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SarkhanTheMad.java b/Mage.Sets/src/mage/cards/s/SarkhanTheMad.java index e22f89568b..bdb98abb0b 100644 --- a/Mage.Sets/src/mage/cards/s/SarkhanTheMad.java +++ b/Mage.Sets/src/mage/cards/s/SarkhanTheMad.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.DragonToken2; @@ -143,7 +142,7 @@ class SarkhanTheMadDragonDamageEffect extends OneShotEffect { static { filter = new FilterControlledPermanent(); filter.add(CardType.CREATURE.getPredicate()); - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } SarkhanTheMadDragonDamageEffect() { diff --git a/Mage.Sets/src/mage/cards/s/SarkhanUnbroken.java b/Mage.Sets/src/mage/cards/s/SarkhanUnbroken.java index af9e7fd473..7cb65b50ac 100644 --- a/Mage.Sets/src/mage/cards/s/SarkhanUnbroken.java +++ b/Mage.Sets/src/mage/cards/s/SarkhanUnbroken.java @@ -20,7 +20,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.token.DragonToken; import mage.players.Player; @@ -35,7 +34,7 @@ public final class SarkhanUnbroken extends CardImpl { private static final FilterCard dragonFilter = new FilterCard("Dragon creature cards"); static { - dragonFilter.add(new SubtypePredicate(SubType.DRAGON)); + dragonFilter.add(SubType.DRAGON.getPredicate()); } public SarkhanUnbroken(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SarkhansTriumph.java b/Mage.Sets/src/mage/cards/s/SarkhansTriumph.java index a184d825f7..6aa33a2f56 100644 --- a/Mage.Sets/src/mage/cards/s/SarkhansTriumph.java +++ b/Mage.Sets/src/mage/cards/s/SarkhansTriumph.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -20,7 +19,7 @@ public final class SarkhansTriumph extends CardImpl { private static final FilterCreatureCard filter = new FilterCreatureCard("Dragon creature card"); static { - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } public SarkhansTriumph(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SaruliGatekeepers.java b/Mage.Sets/src/mage/cards/s/SaruliGatekeepers.java index 2105f70749..96fa1b3e00 100644 --- a/Mage.Sets/src/mage/cards/s/SaruliGatekeepers.java +++ b/Mage.Sets/src/mage/cards/s/SaruliGatekeepers.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -27,7 +26,7 @@ public final class SaruliGatekeepers extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent(); static { - filter.add(new SubtypePredicate(SubType.GATE)); + filter.add(SubType.GATE.getPredicate()); } private static final Condition gatesCondition = new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 1); diff --git a/Mage.Sets/src/mage/cards/s/SavaenElves.java b/Mage.Sets/src/mage/cards/s/SavaenElves.java index d240a2a5d7..b50f7f9f5b 100644 --- a/Mage.Sets/src/mage/cards/s/SavaenElves.java +++ b/Mage.Sets/src/mage/cards/s/SavaenElves.java @@ -17,7 +17,6 @@ import mage.constants.Zone; import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.predicate.ObjectPlayer; import mage.filter.predicate.ObjectPlayerPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -31,7 +30,7 @@ public final class SavaenElves extends CardImpl { private static final FilterEnchantmentPermanent filter = new FilterEnchantmentPermanent("Auras attached to a land"); static { - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); filter.add(new SavaenElvesPredicate()); } diff --git a/Mage.Sets/src/mage/cards/s/SavageThallid.java b/Mage.Sets/src/mage/cards/s/SavageThallid.java index ab4173c9b8..7a54e875b1 100644 --- a/Mage.Sets/src/mage/cards/s/SavageThallid.java +++ b/Mage.Sets/src/mage/cards/s/SavageThallid.java @@ -20,7 +20,6 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SaprolingToken; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; @@ -34,13 +33,13 @@ public final class SavageThallid extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Fungus"); static { - filter.add(new SubtypePredicate(SubType.FUNGUS)); + filter.add(SubType.FUNGUS.getPredicate()); } private static final FilterControlledCreaturePermanent filter2 = new FilterControlledCreaturePermanent("Saproling"); static { - filter2.add(new SubtypePredicate(SubType.SAPROLING)); + filter2.add(SubType.SAPROLING.getPredicate()); } public SavageThallid(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/Scald.java b/Mage.Sets/src/mage/cards/s/Scald.java index 1b0927314e..7e752aab67 100644 --- a/Mage.Sets/src/mage/cards/s/Scald.java +++ b/Mage.Sets/src/mage/cards/s/Scald.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SetTargetPointer; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -21,7 +20,7 @@ public final class Scald extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("a player taps an Island"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } public Scald(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ScaleguardSentinels.java b/Mage.Sets/src/mage/cards/s/ScaleguardSentinels.java index 6f0341a4e0..90377145d7 100644 --- a/Mage.Sets/src/mage/cards/s/ScaleguardSentinels.java +++ b/Mage.Sets/src/mage/cards/s/ScaleguardSentinels.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -32,7 +31,7 @@ public final class ScaleguardSentinels extends CardImpl { private static final FilterCard filter = new FilterCard("a Dragon card from your hand (you don't have to)"); static { - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } public ScaleguardSentinels(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ScalelordReckoner.java b/Mage.Sets/src/mage/cards/s/ScalelordReckoner.java index d44ed673ea..a1189e468f 100644 --- a/Mage.Sets/src/mage/cards/s/ScalelordReckoner.java +++ b/Mage.Sets/src/mage/cards/s/ScalelordReckoner.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterNonlandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -57,7 +56,7 @@ class ScalelardReckonerTriggeredAbility extends TriggeredAbilityImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Dragon creature you control"); static { - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } public ScalelardReckonerTriggeredAbility(Effect effect) { diff --git a/Mage.Sets/src/mage/cards/s/ScarabOfTheUnseen.java b/Mage.Sets/src/mage/cards/s/ScarabOfTheUnseen.java index 6399db24f7..091cc09f07 100644 --- a/Mage.Sets/src/mage/cards/s/ScarabOfTheUnseen.java +++ b/Mage.Sets/src/mage/cards/s/ScarabOfTheUnseen.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.other.OwnerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -60,7 +59,7 @@ class ScarabOfTheUnseenEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterPermanent(); static { - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); } public ScarabOfTheUnseenEffect() { diff --git a/Mage.Sets/src/mage/cards/s/ScarbladeElite.java b/Mage.Sets/src/mage/cards/s/ScarbladeElite.java index 799532699b..ed55e36579 100644 --- a/Mage.Sets/src/mage/cards/s/ScarbladeElite.java +++ b/Mage.Sets/src/mage/cards/s/ScarbladeElite.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetCreaturePermanent; @@ -27,7 +26,7 @@ public final class ScarbladeElite extends CardImpl { private static final FilterCard filter = new FilterCard("Assassin card from your graveyard"); static { - filter.add(new SubtypePredicate(SubType.ASSASSIN)); + filter.add(SubType.ASSASSIN.getPredicate()); } public ScarbladeElite(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/Scarecrone.java b/Mage.Sets/src/mage/cards/s/Scarecrone.java index b9a4552847..aad5261638 100644 --- a/Mage.Sets/src/mage/cards/s/Scarecrone.java +++ b/Mage.Sets/src/mage/cards/s/Scarecrone.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInYourGraveyard; import mage.target.common.TargetControlledCreaturePermanent; @@ -31,7 +30,7 @@ public final class Scarecrone extends CardImpl { static { filter.add(CardType.ARTIFACT.getPredicate()); filter.add(CardType.CREATURE.getPredicate()); - filterScarecrow.add(new SubtypePredicate(SubType.SCARECROW)); + filterScarecrow.add(SubType.SCARECROW.getPredicate()); } public Scarecrone(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ScarredVinebreeder.java b/Mage.Sets/src/mage/cards/s/ScarredVinebreeder.java index e193de9674..63ea24c0bb 100644 --- a/Mage.Sets/src/mage/cards/s/ScarredVinebreeder.java +++ b/Mage.Sets/src/mage/cards/s/ScarredVinebreeder.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInYourGraveyard; /** @@ -26,7 +25,7 @@ public final class ScarredVinebreeder extends CardImpl { private static final FilterCard filter = new FilterCard("Elf card from your graveyard"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public ScarredVinebreeder(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ScavengerGrounds.java b/Mage.Sets/src/mage/cards/s/ScavengerGrounds.java index 1a00972374..b97bfce418 100644 --- a/Mage.Sets/src/mage/cards/s/ScavengerGrounds.java +++ b/Mage.Sets/src/mage/cards/s/ScavengerGrounds.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -27,7 +26,7 @@ public final class ScavengerGrounds extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Desert"); static { - filter.add(new SubtypePredicate(SubType.DESERT)); + filter.add(SubType.DESERT.getPredicate()); } public ScavengerGrounds(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ScionOfOona.java b/Mage.Sets/src/mage/cards/s/ScionOfOona.java index d042d7a3e0..e0ec553bf3 100644 --- a/Mage.Sets/src/mage/cards/s/ScionOfOona.java +++ b/Mage.Sets/src/mage/cards/s/ScionOfOona.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -27,9 +26,9 @@ public final class ScionOfOona extends CardImpl { private static final FilterCreaturePermanent filterCreature = new FilterCreaturePermanent("Faeries"); static { - filter.add(new SubtypePredicate(SubType.FAERIE)); + filter.add(SubType.FAERIE.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); - filterCreature.add(new SubtypePredicate(SubType.FAERIE)); + filterCreature.add(SubType.FAERIE.getPredicate()); filterCreature.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/s/ScionOfTheUrDragon.java b/Mage.Sets/src/mage/cards/s/ScionOfTheUrDragon.java index 5fccd4eb92..22499138fc 100644 --- a/Mage.Sets/src/mage/cards/s/ScionOfTheUrDragon.java +++ b/Mage.Sets/src/mage/cards/s/ScionOfTheUrDragon.java @@ -15,7 +15,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -57,7 +56,7 @@ class ScionOfTheUrDragonEffect extends SearchEffect { private static final FilterCard filter = new FilterPermanentCard("Dragon permanent card"); static { - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } public ScionOfTheUrDragonEffect() { diff --git a/Mage.Sets/src/mage/cards/s/ScorchTheFields.java b/Mage.Sets/src/mage/cards/s/ScorchTheFields.java index 290ea293ce..b2811d2f55 100644 --- a/Mage.Sets/src/mage/cards/s/ScorchTheFields.java +++ b/Mage.Sets/src/mage/cards/s/ScorchTheFields.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetLandPermanent; /** @@ -21,7 +20,7 @@ public final class ScorchTheFields extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Human creature"); static { - filter.add(new SubtypePredicate(SubType.HUMAN)); + filter.add(SubType.HUMAN.getPredicate()); } public ScorchTheFields(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ScourgeOfFleets.java b/Mage.Sets/src/mage/cards/s/ScourgeOfFleets.java index 2d637855e1..73b8fa0472 100644 --- a/Mage.Sets/src/mage/cards/s/ScourgeOfFleets.java +++ b/Mage.Sets/src/mage/cards/s/ScourgeOfFleets.java @@ -14,7 +14,6 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.ToughnessPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; @@ -53,7 +52,7 @@ class ScourgeOfFleetsEffect extends OneShotEffect { private static final FilterControlledPermanent filter = new FilterControlledPermanent("number of Islands you control"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } public ScourgeOfFleetsEffect() { diff --git a/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java b/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java index d762ba2de5..fb5b9849c7 100644 --- a/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java +++ b/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java @@ -19,7 +19,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -34,7 +33,7 @@ public final class ScourgeOfValkas extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("{this} or another Dragon"); static { - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } private static final String rule = "Whenever {this} or another Dragon enters the battlefield under your control, it deals X damage to any target, where X is the number of Dragons you control."; @@ -92,7 +91,7 @@ class ScourgeOfValkasDamageEffect extends OneShotEffect { Permanent enteringDragon = (Permanent) getValue("permanentEnteringBattlefield"); if (controller != null && enteringDragon != null) { FilterPermanent filter = new FilterPermanent(); - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); int dragons = game.getBattlefield().countAll(filter, source.getControllerId(), game); if (dragons > 0) { Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); diff --git a/Mage.Sets/src/mage/cards/s/ScoutTrooper.java b/Mage.Sets/src/mage/cards/s/ScoutTrooper.java index f0e02c49b6..6cc3c89bc0 100644 --- a/Mage.Sets/src/mage/cards/s/ScoutTrooper.java +++ b/Mage.Sets/src/mage/cards/s/ScoutTrooper.java @@ -12,7 +12,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -23,7 +22,7 @@ public final class ScoutTrooper extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Trooper creatures"); static { - filter.add(new SubtypePredicate(SubType.TROOPER)); + filter.add(SubType.TROOPER.getPredicate()); } public ScoutTrooper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ScrapyardRecombiner.java b/Mage.Sets/src/mage/cards/s/ScrapyardRecombiner.java index d442a066ef..e4eb401d2d 100644 --- a/Mage.Sets/src/mage/cards/s/ScrapyardRecombiner.java +++ b/Mage.Sets/src/mage/cards/s/ScrapyardRecombiner.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterControlledArtifactPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledPermanent; @@ -30,7 +29,7 @@ public final class ScrapyardRecombiner extends CardImpl { = new FilterControlledArtifactPermanent("an artifact"); static { - filter.add(new SubtypePredicate(SubType.CONSTRUCT)); + filter.add(SubType.CONSTRUCT.getPredicate()); } public ScrapyardRecombiner(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ScrollOfAvacyn.java b/Mage.Sets/src/mage/cards/s/ScrollOfAvacyn.java index a566b6a3b5..915f936f32 100644 --- a/Mage.Sets/src/mage/cards/s/ScrollOfAvacyn.java +++ b/Mage.Sets/src/mage/cards/s/ScrollOfAvacyn.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class ScrollOfAvacyn extends CardImpl { private static final FilterPermanent filter = new FilterPermanent(); static { - filter.add(new SubtypePredicate(SubType.ANGEL)); + filter.add(SubType.ANGEL.getPredicate()); } public ScrollOfAvacyn(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ScrollOfGriselbrand.java b/Mage.Sets/src/mage/cards/s/ScrollOfGriselbrand.java index 4e87000694..87bfd3e694 100644 --- a/Mage.Sets/src/mage/cards/s/ScrollOfGriselbrand.java +++ b/Mage.Sets/src/mage/cards/s/ScrollOfGriselbrand.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetOpponent; /** @@ -27,7 +26,7 @@ public final class ScrollOfGriselbrand extends CardImpl { private static final FilterPermanent filter = new FilterPermanent(); static { - filter.add(new SubtypePredicate(SubType.DEMON)); + filter.add(SubType.DEMON.getPredicate()); } public ScrollOfGriselbrand(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ScrybRanger.java b/Mage.Sets/src/mage/cards/s/ScrybRanger.java index 7ee94f9d94..c1dca707dd 100644 --- a/Mage.Sets/src/mage/cards/s/ScrybRanger.java +++ b/Mage.Sets/src/mage/cards/s/ScrybRanger.java @@ -17,7 +17,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -30,7 +29,7 @@ public final class ScrybRanger extends CardImpl { private static final FilterControlledLandPermanent filterForest = new FilterControlledLandPermanent("a Forest"); static { - filterForest.add(new SubtypePredicate(SubType.FOREST)); + filterForest.add(SubType.FOREST.getPredicate()); } public ScrybRanger(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SeaGateLoremaster.java b/Mage.Sets/src/mage/cards/s/SeaGateLoremaster.java index 94f8ab3bf3..0dfed395d3 100644 --- a/Mage.Sets/src/mage/cards/s/SeaGateLoremaster.java +++ b/Mage.Sets/src/mage/cards/s/SeaGateLoremaster.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class SeaGateLoremaster extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Ally you control"); static { - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); } public SeaGateLoremaster(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SeaSerpent.java b/Mage.Sets/src/mage/cards/s/SeaSerpent.java index 07b71fee65..145f84d495 100644 --- a/Mage.Sets/src/mage/cards/s/SeaSerpent.java +++ b/Mage.Sets/src/mage/cards/s/SeaSerpent.java @@ -14,7 +14,6 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class SeaSerpent extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("an Island"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } public SeaSerpent(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/Seahunter.java b/Mage.Sets/src/mage/cards/s/Seahunter.java index 19251a6fe7..7a5af126de 100644 --- a/Mage.Sets/src/mage/cards/s/Seahunter.java +++ b/Mage.Sets/src/mage/cards/s/Seahunter.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -26,7 +25,7 @@ public final class Seahunter extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("Merfolk permanent card"); static { - filter.add(new SubtypePredicate(SubType.MERFOLK)); + filter.add(SubType.MERFOLK.getPredicate()); } public Seahunter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SeascapeAerialist.java b/Mage.Sets/src/mage/cards/s/SeascapeAerialist.java index 0b23d35b37..9621a1c233 100644 --- a/Mage.Sets/src/mage/cards/s/SeascapeAerialist.java +++ b/Mage.Sets/src/mage/cards/s/SeascapeAerialist.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -25,7 +24,7 @@ public final class SeascapeAerialist extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Ally creatures you control"); static { - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/s/SeasideHaven.java b/Mage.Sets/src/mage/cards/s/SeasideHaven.java index efc2217dc1..2ad381eec8 100644 --- a/Mage.Sets/src/mage/cards/s/SeasideHaven.java +++ b/Mage.Sets/src/mage/cards/s/SeasideHaven.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -27,7 +26,7 @@ public final class SeasideHaven extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Bird"); static{ - filter.add(new SubtypePredicate(SubType.BIRD)); + filter.add(SubType.BIRD.getPredicate()); } public SeasideHaven(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/Seasinger.java b/Mage.Sets/src/mage/cards/s/Seasinger.java index c0eeef365e..4c11309b14 100644 --- a/Mage.Sets/src/mage/cards/s/Seasinger.java +++ b/Mage.Sets/src/mage/cards/s/Seasinger.java @@ -20,7 +20,6 @@ import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.CardIdPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerControlsIslandPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -36,7 +35,7 @@ public final class Seasinger extends CardImpl { private static final FilterCreaturePermanent creatureWhoseControllerControlsIsland = new FilterCreaturePermanent("creature whose controller controls an island"); static { - islandYouControl.add(new SubtypePredicate(SubType.ISLAND)); + islandYouControl.add(SubType.ISLAND.getPredicate()); islandYouControl.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/s/SecludedGlen.java b/Mage.Sets/src/mage/cards/s/SecludedGlen.java index fc89f8cb27..7170d4e13f 100644 --- a/Mage.Sets/src/mage/cards/s/SecludedGlen.java +++ b/Mage.Sets/src/mage/cards/s/SecludedGlen.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; /** @@ -23,7 +22,7 @@ public final class SecludedGlen extends CardImpl { private static final FilterCard filter = new FilterCard("a Faerie from your hand"); static { - filter.add(new SubtypePredicate(SubType.FAERIE)); + filter.add(SubType.FAERIE.getPredicate()); } public SecludedGlen(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SedgeTroll.java b/Mage.Sets/src/mage/cards/s/SedgeTroll.java index 4258b0ce07..0b5d752c2e 100644 --- a/Mage.Sets/src/mage/cards/s/SedgeTroll.java +++ b/Mage.Sets/src/mage/cards/s/SedgeTroll.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -25,7 +24,7 @@ public final class SedgeTroll extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Swamp"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public SedgeTroll(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SeedguideAsh.java b/Mage.Sets/src/mage/cards/s/SeedguideAsh.java index 4ccc24494f..660b6695dc 100644 --- a/Mage.Sets/src/mage/cards/s/SeedguideAsh.java +++ b/Mage.Sets/src/mage/cards/s/SeedguideAsh.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -23,7 +22,7 @@ public final class SeedguideAsh extends CardImpl { private static final FilterCard filter = new FilterCard("Forest"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public SeedguideAsh(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SeedlingCharm.java b/Mage.Sets/src/mage/cards/s/SeedlingCharm.java index 0490c56ab5..d639c6f526 100644 --- a/Mage.Sets/src/mage/cards/s/SeedlingCharm.java +++ b/Mage.Sets/src/mage/cards/s/SeedlingCharm.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AttachedToPredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -31,7 +30,7 @@ public final class SeedlingCharm extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("green creature"); static { - filter1.add(new SubtypePredicate(SubType.AURA)); + filter1.add(SubType.AURA.getPredicate()); filter1.add(new AttachedToPredicate(new FilterCreaturePermanent())); filter2.add(new ColorPredicate(ObjectColor.GREEN)); } diff --git a/Mage.Sets/src/mage/cards/s/SeethingPathblazer.java b/Mage.Sets/src/mage/cards/s/SeethingPathblazer.java index 85b46e1bb7..eebae911a2 100644 --- a/Mage.Sets/src/mage/cards/s/SeethingPathblazer.java +++ b/Mage.Sets/src/mage/cards/s/SeethingPathblazer.java @@ -16,7 +16,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -28,7 +27,7 @@ public final class SeethingPathblazer extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Elemental"); static { - filter.add(new SubtypePredicate(SubType.ELEMENTAL)); + filter.add(SubType.ELEMENTAL.getPredicate()); } public SeethingPathblazer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SeismicStrike.java b/Mage.Sets/src/mage/cards/s/SeismicStrike.java index 6d8e3e1177..cf155a4054 100644 --- a/Mage.Sets/src/mage/cards/s/SeismicStrike.java +++ b/Mage.Sets/src/mage/cards/s/SeismicStrike.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -21,7 +20,7 @@ public final class SeismicStrike extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Mountains you control"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public SeismicStrike(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SejiriMerfolk.java b/Mage.Sets/src/mage/cards/s/SejiriMerfolk.java index 84167f7ce9..8ac48ba577 100644 --- a/Mage.Sets/src/mage/cards/s/SejiriMerfolk.java +++ b/Mage.Sets/src/mage/cards/s/SejiriMerfolk.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -28,7 +27,7 @@ public final class SejiriMerfolk extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Plains"); static { - filter.add(new SubtypePredicate(SubType.PLAINS)); + filter.add(SubType.PLAINS.getPredicate()); } public SejiriMerfolk(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SekkiSeasonsGuide.java b/Mage.Sets/src/mage/cards/s/SekkiSeasonsGuide.java index 036ccfd832..3813083f16 100644 --- a/Mage.Sets/src/mage/cards/s/SekkiSeasonsGuide.java +++ b/Mage.Sets/src/mage/cards/s/SekkiSeasonsGuide.java @@ -17,7 +17,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -33,7 +32,7 @@ public final class SekkiSeasonsGuide extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("eight Spirits"); static { - filter.add(new SubtypePredicate(SubType.SPIRIT)); + filter.add(SubType.SPIRIT.getPredicate()); } public SekkiSeasonsGuide(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SelectiveSnare.java b/Mage.Sets/src/mage/cards/s/SelectiveSnare.java index 61f62f5d60..c8f53a62aa 100644 --- a/Mage.Sets/src/mage/cards/s/SelectiveSnare.java +++ b/Mage.Sets/src/mage/cards/s/SelectiveSnare.java @@ -12,7 +12,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetPermanent; @@ -63,7 +62,7 @@ enum SelectiveSnareAdjuster implements TargetAdjuster { SubType subType = SubType.byDescription(choice.getChoice()); int xValue = ability.getManaCostsToPay().getX(); FilterPermanent filter = new FilterCreaturePermanent(subType.toString() + " creatures"); - filter.add(new SubtypePredicate(subType)); + filter.add(subType.getPredicate()); ability.getTargets().clear(); ability.addTarget(new TargetPermanent(xValue, filter)); } diff --git a/Mage.Sets/src/mage/cards/s/SelfAssembler.java b/Mage.Sets/src/mage/cards/s/SelfAssembler.java index 83bdea6d09..4fd092a34c 100644 --- a/Mage.Sets/src/mage/cards/s/SelfAssembler.java +++ b/Mage.Sets/src/mage/cards/s/SelfAssembler.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -23,7 +22,7 @@ public final class SelfAssembler extends CardImpl { private static final FilterCard filter = new FilterCard("an Assembly-Worker card"); static { - filter.add(new SubtypePredicate(SubType.ASSEMBLY_WORKER)); + filter.add(SubType.ASSEMBLY_WORKER.getPredicate()); } public SelfAssembler(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SelkieHedgeMage.java b/Mage.Sets/src/mage/cards/s/SelkieHedgeMage.java index bc52232f2c..12103fca94 100644 --- a/Mage.Sets/src/mage/cards/s/SelkieHedgeMage.java +++ b/Mage.Sets/src/mage/cards/s/SelkieHedgeMage.java @@ -16,7 +16,6 @@ import mage.constants.ComparisonType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; @@ -30,8 +29,8 @@ public final class SelkieHedgeMage extends CardImpl { private static final FilterCreaturePermanent filter3 = new FilterCreaturePermanent("tapped creature"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); - filter2.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.FOREST.getPredicate()); + filter2.add(SubType.ISLAND.getPredicate()); filter3.add(TappedPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/s/SengirAutocrat.java b/Mage.Sets/src/mage/cards/s/SengirAutocrat.java index 4355da9a6e..7420097d0a 100644 --- a/Mage.Sets/src/mage/cards/s/SengirAutocrat.java +++ b/Mage.Sets/src/mage/cards/s/SengirAutocrat.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.SerfToken; @@ -26,7 +25,7 @@ public final class SengirAutocrat extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Serf tokens"); static { - filter.add(new SubtypePredicate(SubType.SERF)); + filter.add(SubType.SERF.getPredicate()); filter.add(TokenPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/s/SensorSplicer.java b/Mage.Sets/src/mage/cards/s/SensorSplicer.java index 0a03448dab..a98e971f6e 100644 --- a/Mage.Sets/src/mage/cards/s/SensorSplicer.java +++ b/Mage.Sets/src/mage/cards/s/SensorSplicer.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.GolemToken; /** @@ -28,7 +27,7 @@ public final class SensorSplicer extends CardImpl { static { filter.add(CardType.CREATURE.getPredicate()); - filter.add(new SubtypePredicate(SubType.GOLEM)); + filter.add(SubType.GOLEM.getPredicate()); } public SensorSplicer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SeraphSanctuary.java b/Mage.Sets/src/mage/cards/s/SeraphSanctuary.java index 4187f35796..59fb1a1078 100644 --- a/Mage.Sets/src/mage/cards/s/SeraphSanctuary.java +++ b/Mage.Sets/src/mage/cards/s/SeraphSanctuary.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class SeraphSanctuary extends CardImpl { private static final FilterPermanent filter = new FilterControlledCreaturePermanent("an Angel"); static { - filter.add(new SubtypePredicate(SubType.ANGEL)); + filter.add(SubType.ANGEL.getPredicate()); } public SeraphSanctuary(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); diff --git a/Mage.Sets/src/mage/cards/s/SereneHeart.java b/Mage.Sets/src/mage/cards/s/SereneHeart.java index eafc4a1f6f..8ac94e8d17 100644 --- a/Mage.Sets/src/mage/cards/s/SereneHeart.java +++ b/Mage.Sets/src/mage/cards/s/SereneHeart.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -19,7 +18,7 @@ public final class SereneHeart extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Auras"); static { - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); } public SereneHeart(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SerpentOfTheEndlessSea.java b/Mage.Sets/src/mage/cards/s/SerpentOfTheEndlessSea.java index 5c9b21ae62..478ee344d7 100644 --- a/Mage.Sets/src/mage/cards/s/SerpentOfTheEndlessSea.java +++ b/Mage.Sets/src/mage/cards/s/SerpentOfTheEndlessSea.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class SerpentOfTheEndlessSea extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Islands you control"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } public SerpentOfTheEndlessSea(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SerpentOfYawningDepths.java b/Mage.Sets/src/mage/cards/s/SerpentOfYawningDepths.java index 70dd0f83b9..7e8b2c817e 100644 --- a/Mage.Sets/src/mage/cards/s/SerpentOfYawningDepths.java +++ b/Mage.Sets/src/mage/cards/s/SerpentOfYawningDepths.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -50,10 +49,10 @@ class SerpentOfYawningDepthsEffect extends RestrictionEffect { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.KRAKEN), - new SubtypePredicate(SubType.LEVIATHAN), - new SubtypePredicate(SubType.OCTOPUS), - new SubtypePredicate(SubType.SERPENT) + SubType.KRAKEN.getPredicate(), + SubType.LEVIATHAN.getPredicate(), + SubType.OCTOPUS.getPredicate(), + SubType.SERPENT.getPredicate() )); } diff --git a/Mage.Sets/src/mage/cards/s/SeshiroTheAnointed.java b/Mage.Sets/src/mage/cards/s/SeshiroTheAnointed.java index cca4023c35..9753db7a69 100644 --- a/Mage.Sets/src/mage/cards/s/SeshiroTheAnointed.java +++ b/Mage.Sets/src/mage/cards/s/SeshiroTheAnointed.java @@ -11,7 +11,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; @@ -28,7 +27,7 @@ public final class SeshiroTheAnointed extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Snake creatures"); static { - filter.add(new SubtypePredicate(SubType.SNAKE)); + filter.add(SubType.SNAKE.getPredicate()); } public SeshiroTheAnointed(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SetessanStarbreaker.java b/Mage.Sets/src/mage/cards/s/SetessanStarbreaker.java index ebbade7eda..45892c8b07 100644 --- a/Mage.Sets/src/mage/cards/s/SetessanStarbreaker.java +++ b/Mage.Sets/src/mage/cards/s/SetessanStarbreaker.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -23,7 +22,7 @@ public final class SetessanStarbreaker extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Aura"); static { - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); } public SetessanStarbreaker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SetonKrosanProtector.java b/Mage.Sets/src/mage/cards/s/SetonKrosanProtector.java index 41fc8d67f0..298a22bcd7 100644 --- a/Mage.Sets/src/mage/cards/s/SetonKrosanProtector.java +++ b/Mage.Sets/src/mage/cards/s/SetonKrosanProtector.java @@ -14,7 +14,6 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -28,7 +27,7 @@ public final class SetonKrosanProtector extends CardImpl { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new SubtypePredicate(SubType.DRUID)); + filter.add(SubType.DRUID.getPredicate()); } public SetonKrosanProtector(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ShadowSliver.java b/Mage.Sets/src/mage/cards/s/ShadowSliver.java index 84c72d47f4..c24d38c7be 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowSliver.java +++ b/Mage.Sets/src/mage/cards/s/ShadowSliver.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class ShadowSliver extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("All Sliver creatures"); static { - filter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); } public ShadowSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ShadowTrooper.java b/Mage.Sets/src/mage/cards/s/ShadowTrooper.java index ed46b5fe0e..4b9646a26a 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowTrooper.java +++ b/Mage.Sets/src/mage/cards/s/ShadowTrooper.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class ShadowTrooper extends CardImpl { private static final FilterCreatureCard filter = new FilterCreatureCard("Trooper creatures"); static { - filter.add(new SubtypePredicate(SubType.TROOPER)); + filter.add(SubType.TROOPER.getPredicate()); } public ShadowTrooper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ShadowbornApostle.java b/Mage.Sets/src/mage/cards/s/ShadowbornApostle.java index b5bc2427e2..265c883e59 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowbornApostle.java +++ b/Mage.Sets/src/mage/cards/s/ShadowbornApostle.java @@ -18,7 +18,6 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledCreaturePermanent; @@ -31,7 +30,7 @@ public final class ShadowbornApostle extends CardImpl { private static final FilterCreatureCard filter = new FilterCreatureCard("a Demon creature"); private static final FilterControlledCreaturePermanent filterApostle = new FilterControlledCreaturePermanent("six creatures named Shadowborn Apostle"); static { - filter.add(new SubtypePredicate(SubType.DEMON)); + filter.add(SubType.DEMON.getPredicate()); filterApostle.add(new NamePredicate("Shadowborn Apostle")); } diff --git a/Mage.Sets/src/mage/cards/s/ShadowbornDemon.java b/Mage.Sets/src/mage/cards/s/ShadowbornDemon.java index 4ea9420dc0..c1b51e2954 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowbornDemon.java +++ b/Mage.Sets/src/mage/cards/s/ShadowbornDemon.java @@ -19,7 +19,6 @@ import mage.constants.TargetController; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.Target; @@ -34,7 +33,7 @@ public final class ShadowbornDemon extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Demon creature"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.DEMON))); + filter.add(Predicates.not(SubType.DEMON.getPredicate())); } public ShadowbornDemon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ShaleskinBruiser.java b/Mage.Sets/src/mage/cards/s/ShaleskinBruiser.java index a50bb9be0c..6a1d6253ac 100644 --- a/Mage.Sets/src/mage/cards/s/ShaleskinBruiser.java +++ b/Mage.Sets/src/mage/cards/s/ShaleskinBruiser.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterAttackingCreature; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -26,7 +25,7 @@ public final class ShaleskinBruiser extends CardImpl { private static final FilterAttackingCreature filter = new FilterAttackingCreature("other attacking Beast"); static { - filter.add(new SubtypePredicate(SubType.BEAST)); + filter.add(SubType.BEAST.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/s/ShamanOfThePack.java b/Mage.Sets/src/mage/cards/s/ShamanOfThePack.java index e0635a43ab..8395a42ca4 100644 --- a/Mage.Sets/src/mage/cards/s/ShamanOfThePack.java +++ b/Mage.Sets/src/mage/cards/s/ShamanOfThePack.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetOpponent; @@ -28,7 +27,7 @@ public final class ShamanOfThePack extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public ShamanOfThePack(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ShaperApprentice.java b/Mage.Sets/src/mage/cards/s/ShaperApprentice.java index 69e437c926..931fc48a7f 100644 --- a/Mage.Sets/src/mage/cards/s/ShaperApprentice.java +++ b/Mage.Sets/src/mage/cards/s/ShaperApprentice.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -27,7 +26,7 @@ public final class ShaperApprentice extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("another Merfolk"); static { - filter.add(new SubtypePredicate(SubType.MERFOLK)); + filter.add(SubType.MERFOLK.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/s/Shapesharer.java b/Mage.Sets/src/mage/cards/s/Shapesharer.java index 585159b932..fbca5f79ed 100644 --- a/Mage.Sets/src/mage/cards/s/Shapesharer.java +++ b/Mage.Sets/src/mage/cards/s/Shapesharer.java @@ -12,7 +12,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -27,7 +26,7 @@ public final class Shapesharer extends CardImpl { private static final FilterPermanent filterShapeshifter = new FilterPermanent("Shapeshifter"); static { - filterShapeshifter.add(new SubtypePredicate(SubType.SHAPESHIFTER)); + filterShapeshifter.add(SubType.SHAPESHIFTER.getPredicate()); } public Shapesharer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ShardConvergence.java b/Mage.Sets/src/mage/cards/s/ShardConvergence.java index b0ed89c4df..5d447429c5 100644 --- a/Mage.Sets/src/mage/cards/s/ShardConvergence.java +++ b/Mage.Sets/src/mage/cards/s/ShardConvergence.java @@ -14,7 +14,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; @@ -75,7 +74,7 @@ class ShardConvergenceEffect extends OneShotEffect { private void searchLand(Player player, Ability source, Game game, Cards cards, String subtype) { FilterLandCard filter = new FilterLandCard(subtype); - filter.add(new SubtypePredicate(SubType.byDescription(subtype))); + filter.add(SubType.byDescription(subtype).getPredicate()); TargetCardInLibrary target = new TargetCardInLibrary(filter); if (player.searchLibrary(target, source, game)) { Card card = player.getLibrary().remove(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/s/SharedAnimosity.java b/Mage.Sets/src/mage/cards/s/SharedAnimosity.java index 5cc7288616..01624774ee 100644 --- a/Mage.Sets/src/mage/cards/s/SharedAnimosity.java +++ b/Mage.Sets/src/mage/cards/s/SharedAnimosity.java @@ -13,7 +13,6 @@ import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AttackingPredicate; import mage.filter.predicate.permanent.PermanentIdPredicate; import mage.game.Game; @@ -87,7 +86,7 @@ class SharedAnimosityEffect extends ContinuousEffectImpl { if(!allCreatureTypes){ List> predicateList = new ArrayList<>(); for(SubType subtype : permanent.getSubtype(game)){ - predicateList.add(new SubtypePredicate(subtype)); + predicateList.add(subtype.getPredicate()); } filter.add(Predicates.or(predicateList)); } diff --git a/Mage.Sets/src/mage/cards/s/ShefetDunes.java b/Mage.Sets/src/mage/cards/s/ShefetDunes.java index 453345fa1f..da1865e4af 100644 --- a/Mage.Sets/src/mage/cards/s/ShefetDunes.java +++ b/Mage.Sets/src/mage/cards/s/ShefetDunes.java @@ -18,7 +18,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -30,7 +29,7 @@ public final class ShefetDunes extends CardImpl { private static final FilterControlledPermanent filterDesertPermanent = new FilterControlledPermanent("Desert"); static { - filterDesertPermanent.add(new SubtypePredicate(SubType.DESERT)); + filterDesertPermanent.add(SubType.DESERT.getPredicate()); } public ShefetDunes(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ShefetMonitor.java b/Mage.Sets/src/mage/cards/s/ShefetMonitor.java index e082e7038d..04369090f7 100644 --- a/Mage.Sets/src/mage/cards/s/ShefetMonitor.java +++ b/Mage.Sets/src/mage/cards/s/ShefetMonitor.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; @@ -31,7 +30,7 @@ public final class ShefetMonitor extends CardImpl { Predicates.and( CardType.LAND.getPredicate(), new SupertypePredicate(SuperType.BASIC)), - new SubtypePredicate(SubType.DESERT))); + SubType.DESERT.getPredicate())); } public ShefetMonitor(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ShepherdOfRot.java b/Mage.Sets/src/mage/cards/s/ShepherdOfRot.java index 87f6249fb1..6818fb9c69 100644 --- a/Mage.Sets/src/mage/cards/s/ShepherdOfRot.java +++ b/Mage.Sets/src/mage/cards/s/ShepherdOfRot.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class ShepherdOfRot extends CardImpl { static final private FilterPermanent filter = new FilterPermanent("Zombie"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public ShepherdOfRot(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ShieldOfKaldra.java b/Mage.Sets/src/mage/cards/s/ShieldOfKaldra.java index 32ffec38a0..65e3cefd49 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldOfKaldra.java +++ b/Mage.Sets/src/mage/cards/s/ShieldOfKaldra.java @@ -15,7 +15,6 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class ShieldOfKaldra extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Equipment named Sword of Kaldra, Shield of Kaldra, and Helm of Kaldra"); static { - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); filter.add(Predicates.or( new NamePredicate("Sword of Kaldra"), new NamePredicate("Shield of Kaldra"), diff --git a/Mage.Sets/src/mage/cards/s/ShieldhideDragon.java b/Mage.Sets/src/mage/cards/s/ShieldhideDragon.java index 68d416731e..7587cb9b5b 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldhideDragon.java +++ b/Mage.Sets/src/mage/cards/s/ShieldhideDragon.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -28,7 +27,7 @@ public final class ShieldhideDragon extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } public ShieldhideDragon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ShieldmageElder.java b/Mage.Sets/src/mage/cards/s/ShieldmageElder.java index b79d1d0544..7151e8ed57 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldmageElder.java +++ b/Mage.Sets/src/mage/cards/s/ShieldmageElder.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetSpell; import mage.target.common.TargetControlledPermanent; @@ -31,13 +30,13 @@ public final class ShieldmageElder extends CardImpl { static { filter1.add(Predicates.not(TappedPredicate.instance)); - filter1.add(new SubtypePredicate(SubType.CLERIC)); + filter1.add(SubType.CLERIC.getPredicate()); } private static final FilterControlledPermanent filter2 = new FilterControlledPermanent("untapped Wizards you control"); static { filter2.add(Predicates.not(TappedPredicate.instance)); - filter2.add(new SubtypePredicate(SubType.WIZARD)); + filter2.add(SubType.WIZARD.getPredicate()); } public ShieldmageElder(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ShiftingSliver.java b/Mage.Sets/src/mage/cards/s/ShiftingSliver.java index cdd47e2f4c..71c5bbf2e0 100644 --- a/Mage.Sets/src/mage/cards/s/ShiftingSliver.java +++ b/Mage.Sets/src/mage/cards/s/ShiftingSliver.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -25,8 +24,8 @@ public final class ShiftingSliver extends CardImpl { private static final FilterCreaturePermanent filterBlockedBy = new FilterCreaturePermanent("except by Slivers"); static { - filterCreatures.add(new SubtypePredicate(SubType.SLIVER)); - filterBlockedBy.add(Predicates.not(new SubtypePredicate(SubType.SLIVER))); + filterCreatures.add(SubType.SLIVER.getPredicate()); + filterBlockedBy.add(Predicates.not(SubType.SLIVER.getPredicate())); } public ShiftingSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ShisatoWhisperingHunter.java b/Mage.Sets/src/mage/cards/s/ShisatoWhisperingHunter.java index e506f05a22..67327d7758 100644 --- a/Mage.Sets/src/mage/cards/s/ShisatoWhisperingHunter.java +++ b/Mage.Sets/src/mage/cards/s/ShisatoWhisperingHunter.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class ShisatoWhisperingHunter extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Snake"); static { - filter.add(new SubtypePredicate(SubType.SNAKE)); + filter.add(SubType.SNAKE.getPredicate()); } public ShisatoWhisperingHunter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ShockTrooper.java b/Mage.Sets/src/mage/cards/s/ShockTrooper.java index 6b4a080489..6df2b652af 100644 --- a/Mage.Sets/src/mage/cards/s/ShockTrooper.java +++ b/Mage.Sets/src/mage/cards/s/ShockTrooper.java @@ -12,7 +12,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -23,7 +22,7 @@ public final class ShockTrooper extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Trooper creatures"); static { - filter.add(new SubtypePredicate(SubType.TROOPER)); + filter.add(SubType.TROOPER.getPredicate()); } public ShockTrooper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ShorelineRaider.java b/Mage.Sets/src/mage/cards/s/ShorelineRaider.java index d04b61dc36..b9a9ac9f3a 100644 --- a/Mage.Sets/src/mage/cards/s/ShorelineRaider.java +++ b/Mage.Sets/src/mage/cards/s/ShorelineRaider.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -21,7 +20,7 @@ public final class ShorelineRaider extends CardImpl { private static final FilterCard filter = new FilterCard("Kavu"); static { - filter.add(new SubtypePredicate(SubType.KAVU)); + filter.add(SubType.KAVU.getPredicate()); } diff --git a/Mage.Sets/src/mage/cards/s/ShorelineSalvager.java b/Mage.Sets/src/mage/cards/s/ShorelineSalvager.java index 3ff22606e0..ce52e39421 100644 --- a/Mage.Sets/src/mage/cards/s/ShorelineSalvager.java +++ b/Mage.Sets/src/mage/cards/s/ShorelineSalvager.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -27,7 +26,7 @@ public final class ShorelineSalvager extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } public ShorelineSalvager(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/Sideswipe.java b/Mage.Sets/src/mage/cards/s/Sideswipe.java index 02321f0a83..25243286cf 100644 --- a/Mage.Sets/src/mage/cards/s/Sideswipe.java +++ b/Mage.Sets/src/mage/cards/s/Sideswipe.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetSpell; /** @@ -20,7 +19,7 @@ public final class Sideswipe extends CardImpl { private static final FilterSpell filter = new FilterSpell("Arcane spell"); static { - filter.add(new SubtypePredicate(SubType.ARCANE)); + filter.add(SubType.ARCANE.getPredicate()); } public Sideswipe(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SidewinderNaga.java b/Mage.Sets/src/mage/cards/s/SidewinderNaga.java index 30196dd977..1c6c41410b 100644 --- a/Mage.Sets/src/mage/cards/s/SidewinderNaga.java +++ b/Mage.Sets/src/mage/cards/s/SidewinderNaga.java @@ -20,7 +20,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; @@ -61,13 +60,13 @@ class DesertInGYorBFCondition implements Condition { private static final FilterCard filter = new FilterCard(); static { - filter.add(new SubtypePredicate(SubType.DESERT)); + filter.add(SubType.DESERT.getPredicate()); } private static final FilterControlledLandPermanent filter2 = new FilterControlledLandPermanent("a desert"); static { - filter2.add(new SubtypePredicate(SubType.DESERT)); + filter2.add(SubType.DESERT.getPredicate()); } @Override diff --git a/Mage.Sets/src/mage/cards/s/SidewinderSliver.java b/Mage.Sets/src/mage/cards/s/SidewinderSliver.java index 266ace07ae..0bbdade7b5 100644 --- a/Mage.Sets/src/mage/cards/s/SidewinderSliver.java +++ b/Mage.Sets/src/mage/cards/s/SidewinderSliver.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class SidewinderSliver extends CardImpl { static final private FilterCreaturePermanent filter = new FilterCreaturePermanent("All Sliver creatures"); static { - filter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); } public SidewinderSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SiegeDragon.java b/Mage.Sets/src/mage/cards/s/SiegeDragon.java index 4aec9b8a06..46d343517a 100644 --- a/Mage.Sets/src/mage/cards/s/SiegeDragon.java +++ b/Mage.Sets/src/mage/cards/s/SiegeDragon.java @@ -16,7 +16,6 @@ import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; @@ -33,7 +32,7 @@ public final class SiegeDragon extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Walls your opponents control"); static { - filter.add(new SubtypePredicate(SubType.WALL)); + filter.add(SubType.WALL.getPredicate()); filter.add(new ControllerPredicate(TargetController.OPPONENT)); } @@ -69,7 +68,7 @@ class SiegeDragonAttacksTriggeredAbility extends TriggeredAbilityImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("wall"); static { - filter.add(new SubtypePredicate(SubType.WALL)); + filter.add(SubType.WALL.getPredicate()); } public SiegeDragonAttacksTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/s/SiegeGangCommander.java b/Mage.Sets/src/mage/cards/s/SiegeGangCommander.java index 5fde2cc0fb..c7455dbec1 100644 --- a/Mage.Sets/src/mage/cards/s/SiegeGangCommander.java +++ b/Mage.Sets/src/mage/cards/s/SiegeGangCommander.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.GoblinToken; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetAnyTarget; @@ -30,7 +29,7 @@ public final class SiegeGangCommander extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Goblin"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public SiegeGangCommander(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SiegeModification.java b/Mage.Sets/src/mage/cards/s/SiegeModification.java index e96784bece..b53149a871 100644 --- a/Mage.Sets/src/mage/cards/s/SiegeModification.java +++ b/Mage.Sets/src/mage/cards/s/SiegeModification.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -28,7 +27,7 @@ public final class SiegeModification extends CardImpl { static { filter.add(Predicates.or(CardType.CREATURE.getPredicate(), - new SubtypePredicate(SubType.VEHICLE))); + SubType.VEHICLE.getPredicate())); } public SiegeModification(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SiegeOfTowers.java b/Mage.Sets/src/mage/cards/s/SiegeOfTowers.java index ad58e70f8a..2714ba4ef5 100644 --- a/Mage.Sets/src/mage/cards/s/SiegeOfTowers.java +++ b/Mage.Sets/src/mage/cards/s/SiegeOfTowers.java @@ -2,7 +2,7 @@ package mage.cards.s; import java.util.UUID; -import mage.MageInt; + import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BecomesCreatureTargetEffect; import mage.abilities.keyword.ReplicateAbility; @@ -12,9 +12,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.game.permanent.token.TokenImpl; -import mage.game.permanent.token.Token; import mage.game.permanent.token.custom.CreatureToken; import mage.target.TargetPermanent; @@ -27,7 +24,7 @@ public final class SiegeOfTowers extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Mountain"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public SiegeOfTowers(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java b/Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java index 3b801ce735..d6005a52c7 100644 --- a/Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java +++ b/Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java @@ -18,7 +18,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.HumanSoldierToken; import mage.target.common.TargetCardInYourGraveyard; @@ -31,7 +30,7 @@ public final class SigardaHeronsGrace extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Humans you control"); static { - filter.add(new SubtypePredicate(SubType.HUMAN)); + filter.add(SubType.HUMAN.getPredicate()); } public SigardaHeronsGrace(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SigardasAid.java b/Mage.Sets/src/mage/cards/s/SigardasAid.java index 8b7a18df42..d8a34bafe2 100644 --- a/Mage.Sets/src/mage/cards/s/SigardasAid.java +++ b/Mage.Sets/src/mage/cards/s/SigardasAid.java @@ -13,7 +13,6 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterArtifactPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -29,8 +28,8 @@ public final class SigardasAid extends CardImpl { private static final FilterCard filterCard = new FilterCard("Aura and Equipment spells"); static { - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); - filterCard.add(Predicates.or(new SubtypePredicate(SubType.AURA), new SubtypePredicate(SubType.EQUIPMENT))); + filter.add(SubType.EQUIPMENT.getPredicate()); + filterCard.add(Predicates.or(SubType.AURA.getPredicate(), SubType.EQUIPMENT.getPredicate())); } public SigardasAid(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SigardianPriest.java b/Mage.Sets/src/mage/cards/s/SigardianPriest.java index af1826663e..87493fee99 100644 --- a/Mage.Sets/src/mage/cards/s/SigardianPriest.java +++ b/Mage.Sets/src/mage/cards/s/SigardianPriest.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -27,7 +26,7 @@ public final class SigardianPriest extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Human creature"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.HUMAN))); + filter.add(Predicates.not(SubType.HUMAN.getPredicate())); } public SigardianPriest(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SigilTracer.java b/Mage.Sets/src/mage/cards/s/SigilTracer.java index d8658b60d9..fd3660e7b6 100644 --- a/Mage.Sets/src/mage/cards/s/SigilTracer.java +++ b/Mage.Sets/src/mage/cards/s/SigilTracer.java @@ -16,7 +16,6 @@ import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetSpell; import mage.target.common.TargetControlledCreaturePermanent; @@ -30,7 +29,7 @@ public final class SigilTracer extends CardImpl { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new SubtypePredicate(SubType.WIZARD)); + filter.add(SubType.WIZARD.getPredicate()); } public SigilTracer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SilumgarTheDriftingDeath.java b/Mage.Sets/src/mage/cards/s/SilumgarTheDriftingDeath.java index dc9667af95..e7daa61079 100644 --- a/Mage.Sets/src/mage/cards/s/SilumgarTheDriftingDeath.java +++ b/Mage.Sets/src/mage/cards/s/SilumgarTheDriftingDeath.java @@ -15,7 +15,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -29,7 +28,7 @@ public final class SilumgarTheDriftingDeath extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Dragon you control"); static { - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/s/SilumgarsScorn.java b/Mage.Sets/src/mage/cards/s/SilumgarsScorn.java index c275bbc3a6..fb4ab05538 100644 --- a/Mage.Sets/src/mage/cards/s/SilumgarsScorn.java +++ b/Mage.Sets/src/mage/cards/s/SilumgarsScorn.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.stack.StackObject; import mage.players.Player; @@ -32,7 +31,7 @@ public final class SilumgarsScorn extends CardImpl { private static final FilterCard filter = new FilterCard("a Dragon card from your hand (you don't have to)"); static { - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } public SilumgarsScorn(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SilvergillAdept.java b/Mage.Sets/src/mage/cards/s/SilvergillAdept.java index 73c89ca10b..c5ce56494b 100644 --- a/Mage.Sets/src/mage/cards/s/SilvergillAdept.java +++ b/Mage.Sets/src/mage/cards/s/SilvergillAdept.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInHand; @@ -57,7 +56,7 @@ class SilvergillAdeptCost extends CostImpl { private Cost mana = ManaUtil.createManaCost(3, false); static { - filter.add(new SubtypePredicate(SubType.MERFOLK)); + filter.add(SubType.MERFOLK.getPredicate()); } public SilvergillAdeptCost() { diff --git a/Mage.Sets/src/mage/cards/s/SilvergillDouser.java b/Mage.Sets/src/mage/cards/s/SilvergillDouser.java index 903197f46d..d29c903436 100644 --- a/Mage.Sets/src/mage/cards/s/SilvergillDouser.java +++ b/Mage.Sets/src/mage/cards/s/SilvergillDouser.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -30,7 +29,7 @@ public final class SilvergillDouser extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Merfolk and/or Faeries you control"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.MERFOLK), new SubtypePredicate(SubType.FAERIE))); + filter.add(Predicates.or(SubType.MERFOLK.getPredicate(), SubType.FAERIE.getPredicate())); } public SilvergillDouser(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SilvergladeElemental.java b/Mage.Sets/src/mage/cards/s/SilvergladeElemental.java index b045b1deb7..e04feeb8da 100644 --- a/Mage.Sets/src/mage/cards/s/SilvergladeElemental.java +++ b/Mage.Sets/src/mage/cards/s/SilvergladeElemental.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterLandCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -22,7 +21,7 @@ public final class SilvergladeElemental extends CardImpl { private static final FilterLandCard filter = new FilterLandCard("Forest card"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public SilvergladeElemental(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SimaYiWeiFieldMarshal.java b/Mage.Sets/src/mage/cards/s/SimaYiWeiFieldMarshal.java index 651ffd856b..181ed4caa8 100644 --- a/Mage.Sets/src/mage/cards/s/SimaYiWeiFieldMarshal.java +++ b/Mage.Sets/src/mage/cards/s/SimaYiWeiFieldMarshal.java @@ -10,7 +10,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -21,7 +20,7 @@ public final class SimaYiWeiFieldMarshal extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Swamps you control"); static{ - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public SimaYiWeiFieldMarshal(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SimicGuildmage.java b/Mage.Sets/src/mage/cards/s/SimicGuildmage.java index 45d3b6eec7..bcf8f2f1e0 100644 --- a/Mage.Sets/src/mage/cards/s/SimicGuildmage.java +++ b/Mage.Sets/src/mage/cards/s/SimicGuildmage.java @@ -22,7 +22,6 @@ import mage.filter.predicate.ObjectSourcePlayer; import mage.filter.predicate.ObjectSourcePlayerPredicate; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AnotherTargetPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.filter.predicate.permanent.PermanentIdPredicate; import mage.game.Game; @@ -42,7 +41,7 @@ public final class SimicGuildmage extends CardImpl { private static final FilterEnchantmentPermanent auraFilter = new FilterEnchantmentPermanent("Aura"); static { - auraFilter.add(new SubtypePredicate(SubType.AURA)); + auraFilter.add(SubType.AURA.getPredicate()); } public SimicGuildmage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SionaCaptainOfThePyleas.java b/Mage.Sets/src/mage/cards/s/SionaCaptainOfThePyleas.java index 97838a6a85..71d3986a05 100644 --- a/Mage.Sets/src/mage/cards/s/SionaCaptainOfThePyleas.java +++ b/Mage.Sets/src/mage/cards/s/SionaCaptainOfThePyleas.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -29,7 +28,7 @@ public final class SionaCaptainOfThePyleas extends CardImpl { private static final FilterCard filter = new FilterCard("an Aura card"); static { - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); } public SionaCaptainOfThePyleas(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SithRuins.java b/Mage.Sets/src/mage/cards/s/SithRuins.java index 3c88ffc766..c6ddba0c8a 100644 --- a/Mage.Sets/src/mage/cards/s/SithRuins.java +++ b/Mage.Sets/src/mage/cards/s/SithRuins.java @@ -13,7 +13,6 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; @@ -60,9 +59,9 @@ public final class SithRuins extends CardImpl { FilterCard filter = new FilterCard("basic Island, Swamp or Mountain"); filter.add(CardType.LAND.getPredicate()); List> subtypePredicates = new ArrayList<>(); - subtypePredicates.add(new SubtypePredicate(SubType.SWAMP)); - subtypePredicates.add(new SubtypePredicate(SubType.MOUNTAIN)); - subtypePredicates.add(new SubtypePredicate(SubType.ISLAND)); + subtypePredicates.add(SubType.SWAMP.getPredicate()); + subtypePredicates.add(SubType.MOUNTAIN.getPredicate()); + subtypePredicates.add(SubType.ISLAND.getPredicate()); filter.add(Predicates.or(subtypePredicates)); filter.add(new SupertypePredicate(SuperType.BASIC)); TargetCardInLibrary target = new TargetCardInLibrary(filter); diff --git a/Mage.Sets/src/mage/cards/s/SivvisRuse.java b/Mage.Sets/src/mage/cards/s/SivvisRuse.java index c8d3b108ab..2a833841ef 100644 --- a/Mage.Sets/src/mage/cards/s/SivvisRuse.java +++ b/Mage.Sets/src/mage/cards/s/SivvisRuse.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -26,8 +25,8 @@ public final class SivvisRuse extends CardImpl { private static final FilterPermanent filterPlains = new FilterPermanent(); static { - filterMountain.add(new SubtypePredicate((SubType.MOUNTAIN))); - filterPlains.add(new SubtypePredicate((SubType.PLAINS))); + filterMountain.add(SubType.MOUNTAIN.getPredicate()); + filterPlains.add(SubType.PLAINS.getPredicate()); } public SivvisRuse(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SivvisValor.java b/Mage.Sets/src/mage/cards/s/SivvisValor.java index 307d3a3f45..eb331a4ab1 100644 --- a/Mage.Sets/src/mage/cards/s/SivvisValor.java +++ b/Mage.Sets/src/mage/cards/s/SivvisValor.java @@ -22,7 +22,6 @@ import mage.players.Player; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -37,7 +36,7 @@ public final class SivvisValor extends CardImpl { private static final FilterControlledCreaturePermanent filterCreature = new FilterControlledCreaturePermanent("untapped creature you control"); static { - filter.add(new SubtypePredicate(SubType.PLAINS)); + filter.add(SubType.PLAINS.getPredicate()); filterCreature.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/s/SkeletalVampire.java b/Mage.Sets/src/mage/cards/s/SkeletalVampire.java index d1e0b2b83d..f691d2c9d0 100644 --- a/Mage.Sets/src/mage/cards/s/SkeletalVampire.java +++ b/Mage.Sets/src/mage/cards/s/SkeletalVampire.java @@ -17,7 +17,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.BatToken; import mage.target.common.TargetControlledCreaturePermanent; @@ -30,7 +29,7 @@ public final class SkeletalVampire extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a Bat"); static { - filter.add(new SubtypePredicate(SubType.BAT)); + filter.add(SubType.BAT.getPredicate()); } public SkeletalVampire(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SkirkDrillSergeant.java b/Mage.Sets/src/mage/cards/s/SkirkDrillSergeant.java index 6bdc8fa596..e0c13f0357 100644 --- a/Mage.Sets/src/mage/cards/s/SkirkDrillSergeant.java +++ b/Mage.Sets/src/mage/cards/s/SkirkDrillSergeant.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; @@ -33,7 +32,7 @@ public final class SkirkDrillSergeant extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("or another Goblin"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public SkirkDrillSergeant(UUID ownerId, CardSetInfo setInfo) { @@ -63,7 +62,7 @@ class SkirkDrillSergeantEffect extends OneShotEffect { private static final FilterPermanentCard filter = new FilterPermanentCard("Goblin permanent card"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public SkirkDrillSergeantEffect() { diff --git a/Mage.Sets/src/mage/cards/s/SkirkFireMarshal.java b/Mage.Sets/src/mage/cards/s/SkirkFireMarshal.java index fe57a459ed..ef4e4dbb34 100644 --- a/Mage.Sets/src/mage/cards/s/SkirkFireMarshal.java +++ b/Mage.Sets/src/mage/cards/s/SkirkFireMarshal.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; @@ -30,7 +29,7 @@ public final class SkirkFireMarshal extends CardImpl { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public SkirkFireMarshal(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SkirkOutrider.java b/Mage.Sets/src/mage/cards/s/SkirkOutrider.java index fc18ae87ee..6f5236d95b 100644 --- a/Mage.Sets/src/mage/cards/s/SkirkOutrider.java +++ b/Mage.Sets/src/mage/cards/s/SkirkOutrider.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -28,7 +27,7 @@ public final class SkirkOutrider extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Beast"); static { - filter.add(new SubtypePredicate(SubType.BEAST)); + filter.add(SubType.BEAST.getPredicate()); } public SkirkOutrider(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SkirkProspector.java b/Mage.Sets/src/mage/cards/s/SkirkProspector.java index 2a4624202a..b359eb40ae 100644 --- a/Mage.Sets/src/mage/cards/s/SkirkProspector.java +++ b/Mage.Sets/src/mage/cards/s/SkirkProspector.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledCreaturePermanent; /** @@ -24,7 +23,7 @@ public final class SkirkProspector extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a Goblin"); static { - filter.add(new SubtypePredicate((SubType.GOBLIN))); + filter.add(SubType.GOBLIN.getPredicate()); } public SkirkProspector(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SkirkVolcanist.java b/Mage.Sets/src/mage/cards/s/SkirkVolcanist.java index f56388f166..6737c4c518 100644 --- a/Mage.Sets/src/mage/cards/s/SkirkVolcanist.java +++ b/Mage.Sets/src/mage/cards/s/SkirkVolcanist.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanentAmount; @@ -27,7 +26,7 @@ public final class SkirkVolcanist extends CardImpl { private static final FilterControlledLandPermanent filterSacrifice = new FilterControlledLandPermanent("two Mountains"); static { - filterSacrifice.add(new SubtypePredicate(SubType.MOUNTAIN)); + filterSacrifice.add(SubType.MOUNTAIN.getPredicate()); } public SkirkVolcanist(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SkirsdagFlayer.java b/Mage.Sets/src/mage/cards/s/SkirsdagFlayer.java index fecabdf813..29f8ce21d8 100644 --- a/Mage.Sets/src/mage/cards/s/SkirsdagFlayer.java +++ b/Mage.Sets/src/mage/cards/s/SkirsdagFlayer.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -28,7 +27,7 @@ public final class SkirsdagFlayer extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Human"); static { - filter.add(new SubtypePredicate(SubType.HUMAN)); + filter.add(SubType.HUMAN.getPredicate()); } public SkirsdagFlayer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SkyshroudClaim.java b/Mage.Sets/src/mage/cards/s/SkyshroudClaim.java index 1828f9646a..f9d1c66096 100644 --- a/Mage.Sets/src/mage/cards/s/SkyshroudClaim.java +++ b/Mage.Sets/src/mage/cards/s/SkyshroudClaim.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterLandCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -19,7 +18,7 @@ public final class SkyshroudClaim extends CardImpl { private static final FilterLandCard filter = new FilterLandCard("Forest cards"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public SkyshroudClaim(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{G}"); diff --git a/Mage.Sets/src/mage/cards/s/SkyshroudCutter.java b/Mage.Sets/src/mage/cards/s/SkyshroudCutter.java index 1d5998887d..640772da66 100644 --- a/Mage.Sets/src/mage/cards/s/SkyshroudCutter.java +++ b/Mage.Sets/src/mage/cards/s/SkyshroudCutter.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class SkyshroudCutter extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("If you control a Forest"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public SkyshroudCutter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SkyshroudPoacher.java b/Mage.Sets/src/mage/cards/s/SkyshroudPoacher.java index 70811f6ab0..b688b3badb 100644 --- a/Mage.Sets/src/mage/cards/s/SkyshroudPoacher.java +++ b/Mage.Sets/src/mage/cards/s/SkyshroudPoacher.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -26,7 +25,7 @@ public final class SkyshroudPoacher extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("Elf permanent card"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public SkyshroudPoacher(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SlaveringNulls.java b/Mage.Sets/src/mage/cards/s/SlaveringNulls.java index 5cdd25f835..91dec6147b 100644 --- a/Mage.Sets/src/mage/cards/s/SlaveringNulls.java +++ b/Mage.Sets/src/mage/cards/s/SlaveringNulls.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; @@ -54,7 +53,7 @@ class SlaveringNullsTriggeredAbility extends TriggeredAbilityImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent(); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public SlaveringNullsTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/s/SlayerOfTheWicked.java b/Mage.Sets/src/mage/cards/s/SlayerOfTheWicked.java index 43eeb94238..15e39dfdbc 100644 --- a/Mage.Sets/src/mage/cards/s/SlayerOfTheWicked.java +++ b/Mage.Sets/src/mage/cards/s/SlayerOfTheWicked.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -25,9 +24,9 @@ public final class SlayerOfTheWicked extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.VAMPIRE), - new SubtypePredicate(SubType.WEREWOLF), - new SubtypePredicate(SubType.ZOMBIE))); + SubType.VAMPIRE.getPredicate(), + SubType.WEREWOLF.getPredicate(), + SubType.ZOMBIE.getPredicate())); } public SlayerOfTheWicked(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SlimefootTheStowaway.java b/Mage.Sets/src/mage/cards/s/SlimefootTheStowaway.java index 8fadc309fa..0dbb2b7711 100644 --- a/Mage.Sets/src/mage/cards/s/SlimefootTheStowaway.java +++ b/Mage.Sets/src/mage/cards/s/SlimefootTheStowaway.java @@ -18,7 +18,6 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SaprolingToken; /** @@ -30,7 +29,7 @@ public final class SlimefootTheStowaway extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Saproling you control"); static { - filter.add(new SubtypePredicate(SubType.SAPROLING)); + filter.add(SubType.SAPROLING.getPredicate()); } public SlimefootTheStowaway(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SlingGangLieutenant.java b/Mage.Sets/src/mage/cards/s/SlingGangLieutenant.java index 7838f3102f..65fc28f5b5 100644 --- a/Mage.Sets/src/mage/cards/s/SlingGangLieutenant.java +++ b/Mage.Sets/src/mage/cards/s/SlingGangLieutenant.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.GoblinToken; import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; @@ -28,7 +27,7 @@ public final class SlingGangLieutenant extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Goblin"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public SlingGangLieutenant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SlinnVodaTheRisingDeep.java b/Mage.Sets/src/mage/cards/s/SlinnVodaTheRisingDeep.java index 7a2cbd6948..0b1d7b763c 100644 --- a/Mage.Sets/src/mage/cards/s/SlinnVodaTheRisingDeep.java +++ b/Mage.Sets/src/mage/cards/s/SlinnVodaTheRisingDeep.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -28,11 +27,11 @@ public final class SlinnVodaTheRisingDeep extends CardImpl { static { filter.add(Predicates.not( Predicates.or( - new SubtypePredicate(SubType.KRAKEN), - new SubtypePredicate(SubType.LEVIATHAN), - new SubtypePredicate(SubType.OCTOPUS), - new SubtypePredicate(SubType.MERFOLK), - new SubtypePredicate(SubType.SERPENT)) + SubType.KRAKEN.getPredicate(), + SubType.LEVIATHAN.getPredicate(), + SubType.OCTOPUS.getPredicate(), + SubType.MERFOLK.getPredicate(), + SubType.SERPENT.getPredicate()) )); } diff --git a/Mage.Sets/src/mage/cards/s/SliverHive.java b/Mage.Sets/src/mage/cards/s/SliverHive.java index 31aa59d9cb..abdd83ee0e 100644 --- a/Mage.Sets/src/mage/cards/s/SliverHive.java +++ b/Mage.Sets/src/mage/cards/s/SliverHive.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SliverToken; import java.util.UUID; @@ -35,8 +34,8 @@ public final class SliverHive extends CardImpl { } static { - filter.add(new SubtypePredicate(SubType.SLIVER)); - filterSpell.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); + filterSpell.add(SubType.SLIVER.getPredicate()); } public SliverHive(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SliverOverlord.java b/Mage.Sets/src/mage/cards/s/SliverOverlord.java index 58792486bc..1a5071a867 100644 --- a/Mage.Sets/src/mage/cards/s/SliverOverlord.java +++ b/Mage.Sets/src/mage/cards/s/SliverOverlord.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.Target; import mage.target.TargetPermanent; import mage.target.common.TargetCardInLibrary; @@ -27,7 +26,7 @@ public final class SliverOverlord extends CardImpl { private static final FilterCard filter = new FilterCard("Sliver card"); static{ - filter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); } public SliverOverlord(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SlumberingTora.java b/Mage.Sets/src/mage/cards/s/SlumberingTora.java index 714e2c51b5..c91c47e1cc 100644 --- a/Mage.Sets/src/mage/cards/s/SlumberingTora.java +++ b/Mage.Sets/src/mage/cards/s/SlumberingTora.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCardInHand; @@ -27,7 +26,7 @@ public final class SlumberingTora extends CardImpl { private static final FilterCard filter = new FilterCard("Spirit or Arcane card"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.SPIRIT),new SubtypePredicate(SubType.ARCANE))); + filter.add(Predicates.or(SubType.SPIRIT.getPredicate(),SubType.ARCANE.getPredicate())); } public SlumberingTora(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SmeltWardGatekeepers.java b/Mage.Sets/src/mage/cards/s/SmeltWardGatekeepers.java index dcf97b4eb7..83fd167042 100644 --- a/Mage.Sets/src/mage/cards/s/SmeltWardGatekeepers.java +++ b/Mage.Sets/src/mage/cards/s/SmeltWardGatekeepers.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; @@ -34,7 +33,7 @@ public final class SmeltWardGatekeepers extends CardImpl { private static final FilterCreaturePermanent targetFilter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new SubtypePredicate(SubType.GATE)); + filter.add(SubType.GATE.getPredicate()); targetFilter.add(new ControllerPredicate(TargetController.OPPONENT)); } diff --git a/Mage.Sets/src/mage/cards/s/Snag.java b/Mage.Sets/src/mage/cards/s/Snag.java index 4c016086e6..cfb3ef7e03 100644 --- a/Mage.Sets/src/mage/cards/s/Snag.java +++ b/Mage.Sets/src/mage/cards/s/Snag.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.BlockedPredicate; import mage.target.common.TargetCardInHand; @@ -28,7 +27,7 @@ public final class Snag extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("unblocked creatures"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); filter2.add(Predicates.not(BlockedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/s/SnarlingUndorak.java b/Mage.Sets/src/mage/cards/s/SnarlingUndorak.java index 9768a623e3..c01ef560bd 100644 --- a/Mage.Sets/src/mage/cards/s/SnarlingUndorak.java +++ b/Mage.Sets/src/mage/cards/s/SnarlingUndorak.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -27,7 +26,7 @@ public final class SnarlingUndorak extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Beast creature"); static { - filter.add(new SubtypePredicate(SubType.BEAST)); + filter.add(SubType.BEAST.getPredicate()); } public SnarlingUndorak(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SnuffOut.java b/Mage.Sets/src/mage/cards/s/SnuffOut.java index b5b4104035..3a40c851c3 100644 --- a/Mage.Sets/src/mage/cards/s/SnuffOut.java +++ b/Mage.Sets/src/mage/cards/s/SnuffOut.java @@ -14,7 +14,6 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -30,7 +29,7 @@ public final class SnuffOut extends CardImpl { static { filter.add(Predicates.not(new ColorPredicate(ObjectColor.BLACK))); - filterSwamp.add(new SubtypePredicate(SubType.SWAMP)); + filterSwamp.add(SubType.SWAMP.getPredicate()); } public SnuffOut(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SoldeviExcavations.java b/Mage.Sets/src/mage/cards/s/SoldeviExcavations.java index 21cb230813..d784f3bd72 100644 --- a/Mage.Sets/src/mage/cards/s/SoldeviExcavations.java +++ b/Mage.Sets/src/mage/cards/s/SoldeviExcavations.java @@ -19,7 +19,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -32,7 +31,7 @@ public final class SoldeviExcavations extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("an untapped Island"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/s/SolitaryCamel.java b/Mage.Sets/src/mage/cards/s/SolitaryCamel.java index 99f243d97c..b55c1b5a8b 100644 --- a/Mage.Sets/src/mage/cards/s/SolitaryCamel.java +++ b/Mage.Sets/src/mage/cards/s/SolitaryCamel.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -30,8 +29,8 @@ public final class SolitaryCamel extends CardImpl { private static final FilterCard filterDesertCard = new FilterCard("Desert card"); static { - filterDesertPermanent.add(new SubtypePredicate(SubType.DESERT)); - filterDesertCard.add(new SubtypePredicate(SubType.DESERT)); + filterDesertPermanent.add(SubType.DESERT.getPredicate()); + filterDesertCard.add(SubType.DESERT.getPredicate()); } public SolitaryCamel(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SorinImperiousBloodlord.java b/Mage.Sets/src/mage/cards/s/SorinImperiousBloodlord.java index 1f04e13c51..038ddf9ead 100644 --- a/Mage.Sets/src/mage/cards/s/SorinImperiousBloodlord.java +++ b/Mage.Sets/src/mage/cards/s/SorinImperiousBloodlord.java @@ -20,7 +20,6 @@ import mage.counters.CounterType; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -43,7 +42,7 @@ public final class SorinImperiousBloodlord extends CardImpl { = new FilterCreatureCard("a Vampire creature card"); static { - filter2.add(new SubtypePredicate(SubType.VAMPIRE)); + filter2.add(SubType.VAMPIRE.getPredicate()); } public SorinImperiousBloodlord(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SosukeSonOfSeshiro.java b/Mage.Sets/src/mage/cards/s/SosukeSonOfSeshiro.java index a59212166d..26285cbb2d 100644 --- a/Mage.Sets/src/mage/cards/s/SosukeSonOfSeshiro.java +++ b/Mage.Sets/src/mage/cards/s/SosukeSonOfSeshiro.java @@ -13,7 +13,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.DamagedCreatureEvent; import mage.game.events.GameEvent; @@ -32,7 +31,7 @@ public final class SosukeSonOfSeshiro extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Snake creatures"); static { - filter.add(new SubtypePredicate(SubType.SNAKE)); + filter.add(SubType.SNAKE.getPredicate()); } public SosukeSonOfSeshiro(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SosukesSummons.java b/Mage.Sets/src/mage/cards/s/SosukesSummons.java index 8e8de87915..74b5558bd3 100644 --- a/Mage.Sets/src/mage/cards/s/SosukesSummons.java +++ b/Mage.Sets/src/mage/cards/s/SosukesSummons.java @@ -11,7 +11,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.SnakeToken; @@ -25,7 +24,7 @@ public final class SosukesSummons extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a nontoken Snake"); static { - filter.add(new SubtypePredicate(SubType.SNAKE)); + filter.add(SubType.SNAKE.getPredicate()); filter.add(Predicates.not(TokenPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/s/SoulcatchersAerie.java b/Mage.Sets/src/mage/cards/s/SoulcatchersAerie.java index aec13a77cf..d9fb374c2c 100644 --- a/Mage.Sets/src/mage/cards/s/SoulcatchersAerie.java +++ b/Mage.Sets/src/mage/cards/s/SoulcatchersAerie.java @@ -14,7 +14,6 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -27,8 +26,8 @@ public final class SoulcatchersAerie extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("Bird creatures"); static { - filter.add(new SubtypePredicate(SubType.BIRD)); - filter2.add(new SubtypePredicate(SubType.BIRD)); + filter.add(SubType.BIRD.getPredicate()); + filter2.add(SubType.BIRD.getPredicate()); } public SoulcatchersAerie(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SoullessOne.java b/Mage.Sets/src/mage/cards/s/SoullessOne.java index 6a19ab3aa1..f5ef13f594 100644 --- a/Mage.Sets/src/mage/cards/s/SoullessOne.java +++ b/Mage.Sets/src/mage/cards/s/SoullessOne.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; @@ -54,8 +53,8 @@ class SoullessOneDynamicCount implements DynamicValue { public int calculate(Game game, Ability sourceAbility, Effect effect) { FilterPermanent zombiesBattlefield = new FilterPermanent("Zombies on the battlefield"); FilterCard zombiesInGraveyard = new FilterCard("Zombie cards in all graveyards"); - zombiesBattlefield.add(new SubtypePredicate(SubType.ZOMBIE)); - zombiesInGraveyard.add(new SubtypePredicate(SubType.ZOMBIE)); + zombiesBattlefield.add(SubType.ZOMBIE.getPredicate()); + zombiesInGraveyard.add(SubType.ZOMBIE.getPredicate()); int count = game.getBattlefield().count(zombiesBattlefield, sourceAbility.getSourceId(), sourceAbility.getControllerId(), game); for (UUID playerId : game.getState().getPlayersInRange(sourceAbility.getControllerId(), game)) { diff --git a/Mage.Sets/src/mage/cards/s/SovereignsOfLostAlara.java b/Mage.Sets/src/mage/cards/s/SovereignsOfLostAlara.java index 14990a29f0..3ec4101bda 100644 --- a/Mage.Sets/src/mage/cards/s/SovereignsOfLostAlara.java +++ b/Mage.Sets/src/mage/cards/s/SovereignsOfLostAlara.java @@ -15,7 +15,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.other.AuraCardCanAttachToPermanentId; import mage.game.Game; import mage.game.events.GameEvent; @@ -109,7 +108,7 @@ class SovereignsOfLostAlaraEffect extends OneShotEffect { Permanent attackingCreature = game.getPermanent(getTargetPointer().getFirst(game, source)); if (controller != null && attackingCreature != null) { FilterCard filter = new FilterCard("aura that could enchant the lone attacking creature"); - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); filter.add(new AuraCardCanAttachToPermanentId(attackingCreature.getId())); if (controller.chooseUse(Outcome.Benefit, "Do you want to search your library?", source, game)) { TargetCardInLibrary target = new TargetCardInLibrary(filter); diff --git a/Mage.Sets/src/mage/cards/s/SpareFromEvil.java b/Mage.Sets/src/mage/cards/s/SpareFromEvil.java index d98651a5cd..7724f0c449 100644 --- a/Mage.Sets/src/mage/cards/s/SpareFromEvil.java +++ b/Mage.Sets/src/mage/cards/s/SpareFromEvil.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.filter.StaticFilters; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @author nantuko @@ -22,7 +21,7 @@ public final class SpareFromEvil extends CardImpl { private static final FilterCreatureCard filterNonHuman = new FilterCreatureCard("non-Human creatures"); static { - filterNonHuman.add(Predicates.not(new SubtypePredicate(SubType.HUMAN))); + filterNonHuman.add(Predicates.not(SubType.HUMAN.getPredicate())); } public SpareFromEvil(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/Sparksmith.java b/Mage.Sets/src/mage/cards/s/Sparksmith.java index e2f2846402..b6b118d05f 100644 --- a/Mage.Sets/src/mage/cards/s/Sparksmith.java +++ b/Mage.Sets/src/mage/cards/s/Sparksmith.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -26,7 +25,7 @@ public final class Sparksmith extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Goblins on the battlefield"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public Sparksmith(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpawnOfThraxes.java b/Mage.Sets/src/mage/cards/s/SpawnOfThraxes.java index 835d9d48f7..e4e69e441a 100644 --- a/Mage.Sets/src/mage/cards/s/SpawnOfThraxes.java +++ b/Mage.Sets/src/mage/cards/s/SpawnOfThraxes.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetAnyTarget; /** @@ -25,7 +24,7 @@ public final class SpawnOfThraxes extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Mountains you control"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public SpawnOfThraxes(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpawnbinderMage.java b/Mage.Sets/src/mage/cards/s/SpawnbinderMage.java index 1a163c26c7..5a9020a431 100644 --- a/Mage.Sets/src/mage/cards/s/SpawnbinderMage.java +++ b/Mage.Sets/src/mage/cards/s/SpawnbinderMage.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -30,7 +29,7 @@ public final class SpawnbinderMage extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("an untapped Ally you control"); static { - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java b/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java index 4fdba76236..a6b775eef3 100644 --- a/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java +++ b/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.EldraziSpawnToken; /** @@ -27,7 +26,7 @@ public final class SpawnsireOfUlamog extends CardImpl { private static final FilterCard filter = new FilterCard("Eldrazi cards"); static { - filter.add(new SubtypePredicate(SubType.ELDRAZI)); + filter.add(SubType.ELDRAZI.getPredicate()); } public SpawnsireOfUlamog(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpectralShepherd.java b/Mage.Sets/src/mage/cards/s/SpectralShepherd.java index 1bf3fc2a71..c042665187 100644 --- a/Mage.Sets/src/mage/cards/s/SpectralShepherd.java +++ b/Mage.Sets/src/mage/cards/s/SpectralShepherd.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetControlledPermanent; @@ -29,7 +28,7 @@ public final class SpectralShepherd extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.SPIRIT)); + filter.add(SubType.SPIRIT.getPredicate()); } public SpectralShepherd(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpeederTrooper.java b/Mage.Sets/src/mage/cards/s/SpeederTrooper.java index 9cef7096f8..9fbf7d72c1 100644 --- a/Mage.Sets/src/mage/cards/s/SpeederTrooper.java +++ b/Mage.Sets/src/mage/cards/s/SpeederTrooper.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class SpeederTrooper extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Trooper creatures"); static { - filter.add(new SubtypePredicate(SubType.TROOPER)); + filter.add(SubType.TROOPER.getPredicate()); } public SpeederTrooper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpellstutterSprite.java b/Mage.Sets/src/mage/cards/s/SpellstutterSprite.java index 1126c9bcbc..01fb3fc1f0 100644 --- a/Mage.Sets/src/mage/cards/s/SpellstutterSprite.java +++ b/Mage.Sets/src/mage/cards/s/SpellstutterSprite.java @@ -16,7 +16,6 @@ import mage.filter.FilterPermanent; import mage.filter.FilterSpell; import mage.filter.predicate.ObjectSourcePlayer; import mage.filter.predicate.ObjectSourcePlayerPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.target.TargetSpell; @@ -68,7 +67,7 @@ enum SpellstutterSpritePredicate implements ObjectSourcePlayerPredicate toDiscard = new ArrayList<>(); for (Card card : targetPlayer.getHand().getCards(game)) { if (filterCard.match(card, game)) { @@ -83,7 +82,7 @@ class TsabosDecreeEffect extends OneShotEffect { targetPlayer.discard(card, source, game); } FilterCreaturePermanent filterCreaturePermanent = new FilterCreaturePermanent(); - filterCreaturePermanent.add(new SubtypePredicate(SubType.byDescription(typeChoice.getChoice()))); + filterCreaturePermanent.add(SubType.byDescription(typeChoice.getChoice()).getPredicate()); for (Permanent creature : game.getBattlefield().getActivePermanents(filterCreaturePermanent, source.getSourceId(), game)) { if (creature.isControlledBy(targetPlayer.getId())) { creature.destroy(source.getSourceId(), game, true); diff --git a/Mage.Sets/src/mage/cards/t/Tsunami.java b/Mage.Sets/src/mage/cards/t/Tsunami.java index a0d88258b4..b30317b7ef 100644 --- a/Mage.Sets/src/mage/cards/t/Tsunami.java +++ b/Mage.Sets/src/mage/cards/t/Tsunami.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -18,7 +17,7 @@ public final class Tsunami extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Islands"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } public Tsunami(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TuktukScrapper.java b/Mage.Sets/src/mage/cards/t/TuktukScrapper.java index c7b772f03c..ec8a714410 100644 --- a/Mage.Sets/src/mage/cards/t/TuktukScrapper.java +++ b/Mage.Sets/src/mage/cards/t/TuktukScrapper.java @@ -13,7 +13,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -101,7 +100,7 @@ class TuktukScrapperEffect extends OneShotEffect { private static final FilterControlledPermanent filter = new FilterControlledPermanent(); static { - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); } public TuktukScrapperEffect() { diff --git a/Mage.Sets/src/mage/cards/t/Tunnel.java b/Mage.Sets/src/mage/cards/t/Tunnel.java index 0b0e0f053e..b64d1daaa7 100644 --- a/Mage.Sets/src/mage/cards/t/Tunnel.java +++ b/Mage.Sets/src/mage/cards/t/Tunnel.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -20,7 +19,7 @@ public final class Tunnel extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Wall"); static { - filter.add(new SubtypePredicate(SubType.WALL)); + filter.add(SubType.WALL.getPredicate()); } public Tunnel(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TurnToDust.java b/Mage.Sets/src/mage/cards/t/TurnToDust.java index 201b2e5c30..62decd0d58 100644 --- a/Mage.Sets/src/mage/cards/t/TurnToDust.java +++ b/Mage.Sets/src/mage/cards/t/TurnToDust.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -22,7 +21,7 @@ public final class TurnToDust extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Equipment"); static { - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); } public TurnToDust(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/Typhoon.java b/Mage.Sets/src/mage/cards/t/Typhoon.java index 0ecfe0aee3..aead9e0058 100644 --- a/Mage.Sets/src/mage/cards/t/Typhoon.java +++ b/Mage.Sets/src/mage/cards/t/Typhoon.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -42,7 +41,7 @@ class TyphoonEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterPermanent(); static{ - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } TyphoonEffect() { diff --git a/Mage.Sets/src/mage/cards/u/UbulSarGatekeepers.java b/Mage.Sets/src/mage/cards/u/UbulSarGatekeepers.java index fe7e7d09ab..fb06360486 100644 --- a/Mage.Sets/src/mage/cards/u/UbulSarGatekeepers.java +++ b/Mage.Sets/src/mage/cards/u/UbulSarGatekeepers.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; @@ -29,7 +28,7 @@ public final class UbulSarGatekeepers extends CardImpl { private static final FilterCreaturePermanent targetFilter = new FilterCreaturePermanent("creature an opponent controls"); static { - filter.add(new SubtypePredicate(SubType.GATE)); + filter.add(SubType.GATE.getPredicate()); targetFilter.add(new ControllerPredicate(TargetController.OPPONENT)); } diff --git a/Mage.Sets/src/mage/cards/u/UgnaughtScrapWorker.java b/Mage.Sets/src/mage/cards/u/UgnaughtScrapWorker.java index a498431074..045dcd2118 100644 --- a/Mage.Sets/src/mage/cards/u/UgnaughtScrapWorker.java +++ b/Mage.Sets/src/mage/cards/u/UgnaughtScrapWorker.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class UgnaughtScrapWorker extends CardImpl { private static final FilterCard filter = new FilterCard("Droid spells"); static { - filter.add(new SubtypePredicate(SubType.DROID)); + filter.add(SubType.DROID.getPredicate()); } public UgnaughtScrapWorker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/u/UktabiKong.java b/Mage.Sets/src/mage/cards/u/UktabiKong.java index 1d2f31e7eb..929e11bb19 100644 --- a/Mage.Sets/src/mage/cards/u/UktabiKong.java +++ b/Mage.Sets/src/mage/cards/u/UktabiKong.java @@ -18,7 +18,6 @@ import mage.game.permanent.token.UktabiKongApeToken; import mage.filter.common.FilterArtifactPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -32,7 +31,7 @@ public final class UktabiKong extends CardImpl { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new SubtypePredicate(SubType.APE)); + filter.add(SubType.APE.getPredicate()); } public UktabiKong(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/u/UktabiWildcats.java b/Mage.Sets/src/mage/cards/u/UktabiWildcats.java index df07640653..e46209fdad 100644 --- a/Mage.Sets/src/mage/cards/u/UktabiWildcats.java +++ b/Mage.Sets/src/mage/cards/u/UktabiWildcats.java @@ -18,7 +18,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -31,8 +30,8 @@ public final class UktabiWildcats extends CardImpl { private static final FilterControlledPermanent sacrificeFilter = new FilterControlledPermanent("a Forest"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); - sacrificeFilter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); + sacrificeFilter.add(SubType.FOREST.getPredicate()); } public UktabiWildcats(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/u/UlrichUncontestedAlpha.java b/Mage.Sets/src/mage/cards/u/UlrichUncontestedAlpha.java index f106d6b44c..efd42b28a4 100644 --- a/Mage.Sets/src/mage/cards/u/UlrichUncontestedAlpha.java +++ b/Mage.Sets/src/mage/cards/u/UlrichUncontestedAlpha.java @@ -16,7 +16,6 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -66,7 +65,7 @@ class UlrichUncontestedAlphaAbility extends TriggeredAbilityImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Werewolf creature you don't control"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.WEREWOLF))); + filter.add(Predicates.not(SubType.WEREWOLF.getPredicate())); filter.add(new ControllerPredicate(TargetController.NOT_YOU)); } diff --git a/Mage.Sets/src/mage/cards/u/UlrichsKindred.java b/Mage.Sets/src/mage/cards/u/UlrichsKindred.java index 898256c9e7..c063ffc748 100644 --- a/Mage.Sets/src/mage/cards/u/UlrichsKindred.java +++ b/Mage.Sets/src/mage/cards/u/UlrichsKindred.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AttackingPredicate; import mage.target.common.TargetCreaturePermanent; @@ -29,7 +28,7 @@ public final class UlrichsKindred extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("attacking Wolf or Werewolf"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.WOLF), new SubtypePredicate(SubType.WEREWOLF))); + filter.add(Predicates.or(SubType.WOLF.getPredicate(), SubType.WEREWOLF.getPredicate())); filter.add(AttackingPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/u/UlvenwaldMysteries.java b/Mage.Sets/src/mage/cards/u/UlvenwaldMysteries.java index 36d32c3d71..ec443f794a 100644 --- a/Mage.Sets/src/mage/cards/u/UlvenwaldMysteries.java +++ b/Mage.Sets/src/mage/cards/u/UlvenwaldMysteries.java @@ -15,7 +15,6 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.Game; @@ -35,7 +34,7 @@ public final class UlvenwaldMysteries extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(Predicates.not(TokenPredicate.instance)); - filterClue.add(new SubtypePredicate(SubType.CLUE)); + filterClue.add(SubType.CLUE.getPredicate()); } public UlvenwaldMysteries(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/u/UmbraMystic.java b/Mage.Sets/src/mage/cards/u/UmbraMystic.java index 8fb646de6f..0101ad9840 100644 --- a/Mage.Sets/src/mage/cards/u/UmbraMystic.java +++ b/Mage.Sets/src/mage/cards/u/UmbraMystic.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterEnchantmentPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AttachedToControlledPermanentPredicate; /** @@ -25,7 +24,7 @@ public final class UmbraMystic extends CardImpl { private static final FilterEnchantmentPermanent filter = new FilterEnchantmentPermanent("Auras attached to permanents you control"); static { - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); filter.add(new AttachedToControlledPermanentPredicate()); } diff --git a/Mage.Sets/src/mage/cards/u/UnbreathingHorde.java b/Mage.Sets/src/mage/cards/u/UnbreathingHorde.java index bbf8ba0809..1128412a94 100644 --- a/Mage.Sets/src/mage/cards/u/UnbreathingHorde.java +++ b/Mage.Sets/src/mage/cards/u/UnbreathingHorde.java @@ -12,7 +12,6 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.DamageEvent; import mage.game.events.GameEvent; @@ -57,8 +56,8 @@ class UnbreathingHordeEffect1 extends OneShotEffect { private static final FilterCreatureCard filter2 = new FilterCreatureCard(); static { - filter1.add(new SubtypePredicate(SubType.ZOMBIE)); - filter2.add(new SubtypePredicate(SubType.ZOMBIE)); + filter1.add(SubType.ZOMBIE.getPredicate()); + filter2.add(SubType.ZOMBIE.getPredicate()); } public UnbreathingHordeEffect1() { diff --git a/Mage.Sets/src/mage/cards/u/UnconventionalTactics.java b/Mage.Sets/src/mage/cards/u/UnconventionalTactics.java index 49c18999ad..fb37651075 100644 --- a/Mage.Sets/src/mage/cards/u/UnconventionalTactics.java +++ b/Mage.Sets/src/mage/cards/u/UnconventionalTactics.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -32,7 +31,7 @@ public final class UnconventionalTactics extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Zombie"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public UnconventionalTactics(UUID ownerId, CardSetInfo setInfo) { @@ -66,7 +65,7 @@ class UnconventionalTacticsTriggeredAbility extends TriggeredAbilityImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Zombie"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public UnconventionalTacticsTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/u/UndeadSlayer.java b/Mage.Sets/src/mage/cards/u/UndeadSlayer.java index 7b00a3557f..dd4fa21896 100644 --- a/Mage.Sets/src/mage/cards/u/UndeadSlayer.java +++ b/Mage.Sets/src/mage/cards/u/UndeadSlayer.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -29,9 +28,9 @@ public final class UndeadSlayer extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.SKELETON), - new SubtypePredicate(SubType.VAMPIRE), - new SubtypePredicate(SubType.ZOMBIE))); + SubType.SKELETON.getPredicate(), + SubType.VAMPIRE.getPredicate(), + SubType.ZOMBIE.getPredicate())); } public UndeadSlayer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/u/UndeadWarchief.java b/Mage.Sets/src/mage/cards/u/UndeadWarchief.java index 1d61856c39..c8a10d9f5c 100644 --- a/Mage.Sets/src/mage/cards/u/UndeadWarchief.java +++ b/Mage.Sets/src/mage/cards/u/UndeadWarchief.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,8 +25,8 @@ public final class UndeadWarchief extends CardImpl { private static final FilterCreaturePermanent filterCreatures = new FilterCreaturePermanent("Zombie creatures"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); - filterCreatures.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); + filterCreatures.add(SubType.ZOMBIE.getPredicate()); } public UndeadWarchief(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/u/UnderworldSlums.java b/Mage.Sets/src/mage/cards/u/UnderworldSlums.java index afe33929b8..4ca1e7da20 100644 --- a/Mage.Sets/src/mage/cards/u/UnderworldSlums.java +++ b/Mage.Sets/src/mage/cards/u/UnderworldSlums.java @@ -13,7 +13,6 @@ import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; @@ -60,9 +59,9 @@ public final class UnderworldSlums extends CardImpl { FilterCard filter = new FilterCard("basic Swamp, Mountain or Forest"); filter.add(CardType.LAND.getPredicate()); List> subtypePredicates = new ArrayList<>(); - subtypePredicates.add(new SubtypePredicate(SubType.SWAMP)); - subtypePredicates.add(new SubtypePredicate(SubType.MOUNTAIN)); - subtypePredicates.add(new SubtypePredicate(SubType.FOREST)); + subtypePredicates.add(SubType.SWAMP.getPredicate()); + subtypePredicates.add(SubType.MOUNTAIN.getPredicate()); + subtypePredicates.add(SubType.FOREST.getPredicate()); filter.add(Predicates.or(subtypePredicates)); filter.add(new SupertypePredicate(SuperType.BASIC)); TargetCardInLibrary target = new TargetCardInLibrary(filter); diff --git a/Mage.Sets/src/mage/cards/u/UneshCriosphinxSovereign.java b/Mage.Sets/src/mage/cards/u/UneshCriosphinxSovereign.java index c30f25ae5b..a3539f9a0a 100644 --- a/Mage.Sets/src/mage/cards/u/UneshCriosphinxSovereign.java +++ b/Mage.Sets/src/mage/cards/u/UneshCriosphinxSovereign.java @@ -25,7 +25,6 @@ import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -42,7 +41,7 @@ public final class UneshCriosphinxSovereign extends CardImpl { private static final FilterCard filter = new FilterCard("Sphinx spells"); static { - filter.add(new SubtypePredicate(SubType.SPHINX)); + filter.add(SubType.SPHINX.getPredicate()); } public UneshCriosphinxSovereign(UUID ownerId, CardSetInfo setInfo) { @@ -78,7 +77,7 @@ class UneshCriosphinxSovereignTriggeredAbility extends TriggeredAbilityImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new SubtypePredicate(SubType.SPHINX)); + filter.add(SubType.SPHINX.getPredicate()); } public UneshCriosphinxSovereignTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/u/Unforge.java b/Mage.Sets/src/mage/cards/u/Unforge.java index 3bcde6d2f5..f1f777176b 100644 --- a/Mage.Sets/src/mage/cards/u/Unforge.java +++ b/Mage.Sets/src/mage/cards/u/Unforge.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterArtifactPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetArtifactPermanent; @@ -26,7 +25,7 @@ public final class Unforge extends CardImpl { private static FilterArtifactPermanent filter = new FilterArtifactPermanent("equipment"); static{ - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); } public Unforge(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/u/UnholyGrotto.java b/Mage.Sets/src/mage/cards/u/UnholyGrotto.java index c9000f2366..035d9532b1 100644 --- a/Mage.Sets/src/mage/cards/u/UnholyGrotto.java +++ b/Mage.Sets/src/mage/cards/u/UnholyGrotto.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInYourGraveyard; /** @@ -26,7 +25,7 @@ public final class UnholyGrotto extends CardImpl { private static final FilterCard filter = new FilterCard("Zombie card from your graveyard"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public UnholyGrotto(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/u/UnifiedStrike.java b/Mage.Sets/src/mage/cards/u/UnifiedStrike.java index 192534d9dd..c42050923f 100644 --- a/Mage.Sets/src/mage/cards/u/UnifiedStrike.java +++ b/Mage.Sets/src/mage/cards/u/UnifiedStrike.java @@ -11,7 +11,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -46,7 +45,7 @@ class UnifiedStrikeEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterPermanent(); static { - filter.add(new SubtypePredicate(SubType.SOLDIER)); + filter.add(SubType.SOLDIER.getPredicate()); } UnifiedStrikeEffect() { diff --git a/Mage.Sets/src/mage/cards/u/UnquenchableThirst.java b/Mage.Sets/src/mage/cards/u/UnquenchableThirst.java index ad47395144..a3848a201e 100644 --- a/Mage.Sets/src/mage/cards/u/UnquenchableThirst.java +++ b/Mage.Sets/src/mage/cards/u/UnquenchableThirst.java @@ -21,7 +21,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -35,8 +34,8 @@ public final class UnquenchableThirst extends CardImpl { private static final FilterCard filterDesertCard = new FilterCard("Desert card"); static { - filterDesertPermanent.add(new SubtypePredicate(SubType.DESERT)); - filterDesertCard.add(new SubtypePredicate(SubType.DESERT)); + filterDesertPermanent.add(SubType.DESERT.getPredicate()); + filterDesertCard.add(SubType.DESERT.getPredicate()); } public UnquenchableThirst(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/u/UnravelingMummy.java b/Mage.Sets/src/mage/cards/u/UnravelingMummy.java index b995e43ca5..64f6551d3c 100644 --- a/Mage.Sets/src/mage/cards/u/UnravelingMummy.java +++ b/Mage.Sets/src/mage/cards/u/UnravelingMummy.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AttackingPredicate; import mage.target.common.TargetCreaturePermanent; @@ -31,7 +30,7 @@ public final class UnravelingMummy extends CardImpl { static { filter.add(AttackingPredicate.instance); - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public UnravelingMummy(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/u/UrgeToFeed.java b/Mage.Sets/src/mage/cards/u/UrgeToFeed.java index e5fbd52a95..3f1a4611a7 100644 --- a/Mage.Sets/src/mage/cards/u/UrgeToFeed.java +++ b/Mage.Sets/src/mage/cards/u/UrgeToFeed.java @@ -11,7 +11,6 @@ import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; @@ -51,7 +50,7 @@ class UrgeToFeedEffect extends OneShotEffect { static { filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); } public UrgeToFeedEffect() { diff --git a/Mage.Sets/src/mage/cards/u/UrgentExorcism.java b/Mage.Sets/src/mage/cards/u/UrgentExorcism.java index ef837c123c..a6839c00ac 100644 --- a/Mage.Sets/src/mage/cards/u/UrgentExorcism.java +++ b/Mage.Sets/src/mage/cards/u/UrgentExorcism.java @@ -9,7 +9,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -22,7 +21,7 @@ public final class UrgentExorcism extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.SPIRIT), + SubType.SPIRIT.getPredicate(), CardType.ENCHANTMENT.getPredicate())); } diff --git a/Mage.Sets/src/mage/cards/u/UtopiaMycon.java b/Mage.Sets/src/mage/cards/u/UtopiaMycon.java index e8fa95d718..d8ae0807d7 100644 --- a/Mage.Sets/src/mage/cards/u/UtopiaMycon.java +++ b/Mage.Sets/src/mage/cards/u/UtopiaMycon.java @@ -19,7 +19,6 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SaprolingToken; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; @@ -33,7 +32,7 @@ public final class UtopiaMycon extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Saproling"); static { - filter.add(new SubtypePredicate(SubType.SAPROLING)); + filter.add(SubType.SAPROLING.getPredicate()); } public UtopiaMycon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/u/UtvaraHellkite.java b/Mage.Sets/src/mage/cards/u/UtvaraHellkite.java index 8570a8bcff..b3a64873a5 100644 --- a/Mage.Sets/src/mage/cards/u/UtvaraHellkite.java +++ b/Mage.Sets/src/mage/cards/u/UtvaraHellkite.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.UtvaraHellkiteDragonToken; /** @@ -23,7 +22,7 @@ public final class UtvaraHellkite extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Dragon you control"); static { - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); } public UtvaraHellkite(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/ValakutTheMoltenPinnacle.java b/Mage.Sets/src/mage/cards/v/ValakutTheMoltenPinnacle.java index be270c6477..f566789ae2 100644 --- a/Mage.Sets/src/mage/cards/v/ValakutTheMoltenPinnacle.java +++ b/Mage.Sets/src/mage/cards/v/ValakutTheMoltenPinnacle.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -31,7 +30,7 @@ public final class ValakutTheMoltenPinnacle extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public ValakutTheMoltenPinnacle(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/Valleymaker.java b/Mage.Sets/src/mage/cards/v/Valleymaker.java index b714e7af24..4d837db827 100644 --- a/Mage.Sets/src/mage/cards/v/Valleymaker.java +++ b/Mage.Sets/src/mage/cards/v/Valleymaker.java @@ -17,7 +17,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -31,8 +30,8 @@ public final class Valleymaker extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Mountain"); private static final FilterControlledPermanent filter2 = new FilterControlledPermanent("a Forest"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); - filter2.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.MOUNTAIN.getPredicate()); + filter2.add(SubType.FOREST.getPredicate()); } public Valleymaker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/Valor.java b/Mage.Sets/src/mage/cards/v/Valor.java index 466e34dbcc..cce6cee6d2 100644 --- a/Mage.Sets/src/mage/cards/v/Valor.java +++ b/Mage.Sets/src/mage/cards/v/Valor.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -31,7 +30,7 @@ public final class Valor extends CardImpl { static { filter.add(CardType.LAND.getPredicate()); - filter.add(new SubtypePredicate(SubType.PLAINS)); + filter.add(SubType.PLAINS.getPredicate()); } public Valor(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VampireNocturnus.java b/Mage.Sets/src/mage/cards/v/VampireNocturnus.java index d7899f5814..73277ae0e4 100644 --- a/Mage.Sets/src/mage/cards/v/VampireNocturnus.java +++ b/Mage.Sets/src/mage/cards/v/VampireNocturnus.java @@ -22,7 +22,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; @@ -60,7 +59,7 @@ class VampireNocturnusAbility extends StaticAbility { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new SubtypePredicate(SubType.VAMPIRE)); + filter.add(SubType.VAMPIRE.getPredicate()); } public VampireNocturnusAbility() { diff --git a/Mage.Sets/src/mage/cards/v/VampiricFury.java b/Mage.Sets/src/mage/cards/v/VampiricFury.java index 3e793eeb37..3a2dc63523 100644 --- a/Mage.Sets/src/mage/cards/v/VampiricFury.java +++ b/Mage.Sets/src/mage/cards/v/VampiricFury.java @@ -12,7 +12,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -23,7 +22,7 @@ public final class VampiricFury extends CardImpl { private static final FilterCreaturePermanent vampires = new FilterCreaturePermanent("Vampire creatures"); static { - vampires.add(new SubtypePredicate(SubType.VAMPIRE)); + vampires.add(SubType.VAMPIRE.getPredicate()); vampires.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/v/VampiricSliver.java b/Mage.Sets/src/mage/cards/v/VampiricSliver.java index 4fdec6762d..63a8845e29 100644 --- a/Mage.Sets/src/mage/cards/v/VampiricSliver.java +++ b/Mage.Sets/src/mage/cards/v/VampiricSliver.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class VampiricSliver extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); static { - filter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); } public VampiricSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VarchildsCrusader.java b/Mage.Sets/src/mage/cards/v/VarchildsCrusader.java index fb574845b3..8e626bf4c3 100644 --- a/Mage.Sets/src/mage/cards/v/VarchildsCrusader.java +++ b/Mage.Sets/src/mage/cards/v/VarchildsCrusader.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -28,7 +27,7 @@ public final class VarchildsCrusader extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("except by Walls"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.WALL))); + filter.add(Predicates.not(SubType.WALL.getPredicate())); } public VarchildsCrusader(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VastwoodAnimist.java b/Mage.Sets/src/mage/cards/v/VastwoodAnimist.java index cf9572a593..16b0fd37b3 100644 --- a/Mage.Sets/src/mage/cards/v/VastwoodAnimist.java +++ b/Mage.Sets/src/mage/cards/v/VastwoodAnimist.java @@ -15,10 +15,8 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.token.TokenImpl; -import mage.game.permanent.token.Token; import mage.target.common.TargetControlledPermanent; /** @@ -57,7 +55,7 @@ class VastwoodAnimistEffect extends OneShotEffect { static final FilterControlledPermanent filterAllies = new FilterControlledPermanent("allies you control"); static { - filterAllies.add(new SubtypePredicate(SubType.ALLY)); + filterAllies.add(SubType.ALLY.getPredicate()); } public VastwoodAnimistEffect() { diff --git a/Mage.Sets/src/mage/cards/v/VedalkenAethermage.java b/Mage.Sets/src/mage/cards/v/VedalkenAethermage.java index e428955b88..b7e2e53978 100644 --- a/Mage.Sets/src/mage/cards/v/VedalkenAethermage.java +++ b/Mage.Sets/src/mage/cards/v/VedalkenAethermage.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -28,8 +27,8 @@ public final class VedalkenAethermage extends CardImpl { private static final FilterCard filter2 = new FilterCard("Wizard"); static { - filter.add(new SubtypePredicate(SubType.SLIVER)); - filter2.add(new SubtypePredicate(SubType.WIZARD)); + filter.add(SubType.SLIVER.getPredicate()); + filter2.add(SubType.WIZARD.getPredicate()); } public VedalkenAethermage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/v/VedalkenShackles.java b/Mage.Sets/src/mage/cards/v/VedalkenShackles.java index 436a5deedc..b8171e5243 100644 --- a/Mage.Sets/src/mage/cards/v/VedalkenShackles.java +++ b/Mage.Sets/src/mage/cards/v/VedalkenShackles.java @@ -20,7 +20,6 @@ import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.ObjectPlayer; import mage.filter.predicate.ObjectPlayerPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; @@ -67,7 +66,7 @@ class PowerIslandPredicate implements ObjectPlayerPredicate 0) { - DamageCreatureEvent damageEvent = (DamageCreatureEvent) event; - if (event.getTargetId().equals(source.getSourceId())) { - Permanent permanent = game.getPermanentOrLKIBattlefield(damageEvent.getSourceId()); - FilterCreaturePermanent filter = new FilterCreaturePermanent(); - filter.add(new BlockedByIdPredicate(source.getSourceId())); - if (permanent != null && filter.match(permanent, game)) { - return true; - } - } + if (!super.applies(event, source, game) + || !(event instanceof DamageCreatureEvent) + || event.getAmount() <= 0) { + return false; } - return false; + DamageCreatureEvent damageEvent = (DamageCreatureEvent) event; + if (!event.getTargetId().equals(source.getSourceId())) { + return false; + } + Permanent permanent = game.getPermanentOrLKIBattlefield(damageEvent.getSourceId()); + FilterCreaturePermanent filter = new FilterCreaturePermanent(); + filter.add(new BlockedByIdPredicate(source.getSourceId())); + return permanent != null && filter.match(permanent, game); } } -class CanTargetOnlyWallsPredicate implements Predicate { +enum CanTargetOnlyWallsPredicate implements Predicate { + instance; @Override public boolean apply(MageObject input, Game game) { - boolean canTargetOnlyWalls = false; StackObject stackObject = game.getStack().getSpell(input.getId()); - if (stackObject != null) { - for (Mode mode : stackObject.getStackAbility().getModes().values()) { - for (Target target : mode.getTargets()) { - Filter filter = target.getFilter(); - if (filter instanceof FilterPermanent) { - for (Object predicate : filter.getPredicates()) { - if (predicate instanceof SubtypePredicate) { - if (predicate.toString().equals("Subtype(Wall)")) { - canTargetOnlyWalls = true; // can target a Wall - } else { - return false; // can target a non-Wall permanent - } - } - // no return statement here, as different predicates might still apply (e.g. "blocking Wall") + if (stackObject == null) { + return false; + } + boolean canTargetOnlyWalls = false; + for (Mode mode : stackObject.getStackAbility().getModes().values()) { + for (Target target : mode.getTargets()) { + Filter filter = target.getFilter(); + if (!(filter instanceof FilterPermanent)) { + return false; // can target non-permanents (i.e. not Walls) + } + for (Object predicate : filter.getPredicates()) { + if (predicate instanceof SubType.SubTypePredicate) { + if (predicate.toString().equals("Subtype(Wall)")) { + canTargetOnlyWalls = true; // can target a Wall + } else { + return false; // can target a non-Wall permanent } - } else { - return false; // can target non-permanents (i.e. not Walls) } + // no return statement here, as different predicates might still apply (e.g. "blocking Wall") } } } diff --git a/Mage.Sets/src/mage/cards/w/WandOfTheElements.java b/Mage.Sets/src/mage/cards/w/WandOfTheElements.java index e225cdf1ef..bd657196f5 100644 --- a/Mage.Sets/src/mage/cards/w/WandOfTheElements.java +++ b/Mage.Sets/src/mage/cards/w/WandOfTheElements.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.WandOfTheElementsFirstToken; import mage.game.permanent.token.WandOfTheElementsSecondToken; import mage.target.common.TargetControlledPermanent; @@ -27,8 +26,8 @@ public final class WandOfTheElements extends CardImpl { private static final FilterControlledPermanent mountainFilter = new FilterControlledPermanent("a Mountain"); static { - islandFilter.add(new SubtypePredicate(SubType.ISLAND)); - mountainFilter.add(new SubtypePredicate(SubType.MOUNTAIN)); + islandFilter.add(SubType.ISLAND.getPredicate()); + mountainFilter.add(SubType.MOUNTAIN.getPredicate()); } public WandOfTheElements(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WanderingMage.java b/Mage.Sets/src/mage/cards/w/WanderingMage.java index 9b61d04fd5..71ab5592c0 100644 --- a/Mage.Sets/src/mage/cards/w/WanderingMage.java +++ b/Mage.Sets/src/mage/cards/w/WanderingMage.java @@ -19,7 +19,6 @@ import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.Target; @@ -37,8 +36,8 @@ public final class WanderingMage extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.CLERIC), - new SubtypePredicate(SubType.WIZARD))); + SubType.CLERIC.getPredicate(), + SubType.WIZARD.getPredicate())); } public WanderingMage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WanderwineHub.java b/Mage.Sets/src/mage/cards/w/WanderwineHub.java index 69321d876f..45c78f190f 100644 --- a/Mage.Sets/src/mage/cards/w/WanderwineHub.java +++ b/Mage.Sets/src/mage/cards/w/WanderwineHub.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; /** @@ -23,7 +22,7 @@ public final class WanderwineHub extends CardImpl { private static final FilterCard filter = new FilterCard("a Merfolk card from your hand"); static { - filter.add(new SubtypePredicate(SubType.MERFOLK)); + filter.add(SubType.MERFOLK.getPredicate()); } public WanderwineHub(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WanderwineProphets.java b/Mage.Sets/src/mage/cards/w/WanderwineProphets.java index 6e841f0507..dd15343828 100644 --- a/Mage.Sets/src/mage/cards/w/WanderwineProphets.java +++ b/Mage.Sets/src/mage/cards/w/WanderwineProphets.java @@ -14,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; /** @@ -26,7 +25,7 @@ public final class WanderwineProphets extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Merfolk"); static { - filter.add(new SubtypePredicate(SubType.MERFOLK)); + filter.add(SubType.MERFOLK.getPredicate()); } public WanderwineProphets(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WarFalcon.java b/Mage.Sets/src/mage/cards/w/WarFalcon.java index e1fc9ba972..b9c43085db 100644 --- a/Mage.Sets/src/mage/cards/w/WarFalcon.java +++ b/Mage.Sets/src/mage/cards/w/WarFalcon.java @@ -13,7 +13,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -54,8 +53,8 @@ class WarFalconEffect extends RestrictionEffect { static { filter.add(Predicates.or( - new SubtypePredicate(SubType.KNIGHT), - new SubtypePredicate(SubType.SOLDIER))); + SubType.KNIGHT.getPredicate(), + SubType.SOLDIER.getPredicate())); } public WarFalconEffect() { diff --git a/Mage.Sets/src/mage/cards/w/WardSliver.java b/Mage.Sets/src/mage/cards/w/WardSliver.java index 34c31a1153..bb40a421f0 100644 --- a/Mage.Sets/src/mage/cards/w/WardSliver.java +++ b/Mage.Sets/src/mage/cards/w/WardSliver.java @@ -16,7 +16,6 @@ import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -60,7 +59,7 @@ class WardSliverGainAbilityControlledEffect extends ContinuousEffectImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Slivers"); static { - filter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); } protected FilterPermanent protectionFilter; diff --git a/Mage.Sets/src/mage/cards/w/WardenOfTheFirstTree.java b/Mage.Sets/src/mage/cards/w/WardenOfTheFirstTree.java index f848ccabeb..5c3a6624bc 100644 --- a/Mage.Sets/src/mage/cards/w/WardenOfTheFirstTree.java +++ b/Mage.Sets/src/mage/cards/w/WardenOfTheFirstTree.java @@ -21,9 +21,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.TokenImpl; -import mage.game.permanent.token.Token; /** * @@ -35,8 +33,8 @@ public final class WardenOfTheFirstTree extends CardImpl { private static final FilterCreaturePermanent FILTER2 = new FilterCreaturePermanent(); static { - FILTER.add(new SubtypePredicate(SubType.WARRIOR)); - FILTER2.add(new SubtypePredicate(SubType.SPIRIT)); + FILTER.add(SubType.WARRIOR.getPredicate()); + FILTER2.add(SubType.SPIRIT.getPredicate()); } public WardenOfTheFirstTree(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WarrenInstigator.java b/Mage.Sets/src/mage/cards/w/WarrenInstigator.java index 13f8b58a36..1dcb45e694 100644 --- a/Mage.Sets/src/mage/cards/w/WarrenInstigator.java +++ b/Mage.Sets/src/mage/cards/w/WarrenInstigator.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class WarrenInstigator extends CardImpl { private static final FilterCreatureCard filter = new FilterCreatureCard("a Goblin creature card"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public WarrenInstigator(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WarrenScourgeElf.java b/Mage.Sets/src/mage/cards/w/WarrenScourgeElf.java index 25e0f000dd..2969aa1cfd 100644 --- a/Mage.Sets/src/mage/cards/w/WarrenScourgeElf.java +++ b/Mage.Sets/src/mage/cards/w/WarrenScourgeElf.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -20,7 +19,7 @@ public final class WarrenScourgeElf extends CardImpl { private static final FilterCard filter = new FilterCard("Goblin"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public WarrenScourgeElf(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WarrenWeirding.java b/Mage.Sets/src/mage/cards/w/WarrenWeirding.java index b5de439dac..06de8220b6 100644 --- a/Mage.Sets/src/mage/cards/w/WarrenWeirding.java +++ b/Mage.Sets/src/mage/cards/w/WarrenWeirding.java @@ -18,7 +18,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -59,7 +58,7 @@ class WarrenWeirdingEffect extends OneShotEffect { private static final FilterCreaturePermanent filterGoblin = new FilterCreaturePermanent(); static { - filterGoblin.add(new SubtypePredicate(SubType.GOBLIN)); + filterGoblin.add(SubType.GOBLIN.getPredicate()); } WarrenWeirdingEffect() { diff --git a/Mage.Sets/src/mage/cards/w/WaspOfTheBitterEnd.java b/Mage.Sets/src/mage/cards/w/WaspOfTheBitterEnd.java index 4b148c2dd0..2081f64bb1 100644 --- a/Mage.Sets/src/mage/cards/w/WaspOfTheBitterEnd.java +++ b/Mage.Sets/src/mage/cards/w/WaspOfTheBitterEnd.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -26,7 +25,7 @@ public final class WaspOfTheBitterEnd extends CardImpl { static { filter.add(CardType.PLANESWALKER.getPredicate()); - filter.add(new SubtypePredicate(SubType.BOLAS)); + filter.add(SubType.BOLAS.getPredicate()); } public WaspOfTheBitterEnd(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WaterspoutDjinn.java b/Mage.Sets/src/mage/cards/w/WaterspoutDjinn.java index 2ccd435cb4..1390435f64 100644 --- a/Mage.Sets/src/mage/cards/w/WaterspoutDjinn.java +++ b/Mage.Sets/src/mage/cards/w/WaterspoutDjinn.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; @@ -27,7 +26,7 @@ public final class WaterspoutDjinn extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("an untapped Island"); static{ - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/w/WaxingMoon.java b/Mage.Sets/src/mage/cards/w/WaxingMoon.java index f23908c3bf..04ca464441 100644 --- a/Mage.Sets/src/mage/cards/w/WaxingMoon.java +++ b/Mage.Sets/src/mage/cards/w/WaxingMoon.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -27,7 +26,7 @@ public final class WaxingMoon extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Werewolf you control"); static { - filter.add(new SubtypePredicate(SubType.WEREWOLF)); + filter.add(SubType.WEREWOLF.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/w/WayOfTheThief.java b/Mage.Sets/src/mage/cards/w/WayOfTheThief.java index b4644afddb..4c8e36d615 100644 --- a/Mage.Sets/src/mage/cards/w/WayOfTheThief.java +++ b/Mage.Sets/src/mage/cards/w/WayOfTheThief.java @@ -15,7 +15,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -28,7 +27,7 @@ public final class WayOfTheThief extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Gate"); static { - filter.add(new SubtypePredicate(SubType.GATE)); + filter.add(SubType.GATE.getPredicate()); } private static final String rule = "Enchanted creature can't be blocked as long as you control a Gate"; diff --git a/Mage.Sets/src/mage/cards/w/WaywardServant.java b/Mage.Sets/src/mage/cards/w/WaywardServant.java index 19a4b2ab1f..0c2f92e8c5 100644 --- a/Mage.Sets/src/mage/cards/w/WaywardServant.java +++ b/Mage.Sets/src/mage/cards/w/WaywardServant.java @@ -13,7 +13,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; /** @@ -25,7 +24,7 @@ public final class WaywardServant extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("another Zombie"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); filter.add(AnotherPredicate.instance); } diff --git a/Mage.Sets/src/mage/cards/w/WeaponsTrainer.java b/Mage.Sets/src/mage/cards/w/WeaponsTrainer.java index 4778a40d5b..745e84baff 100644 --- a/Mage.Sets/src/mage/cards/w/WeaponsTrainer.java +++ b/Mage.Sets/src/mage/cards/w/WeaponsTrainer.java @@ -14,7 +14,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -26,7 +25,7 @@ public final class WeaponsTrainer extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("an Equipment"); static { - filter.add(new SubtypePredicate(SubType.EQUIPMENT)); + filter.add(SubType.EQUIPMENT.getPredicate()); } public WeaponsTrainer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WeirdingShaman.java b/Mage.Sets/src/mage/cards/w/WeirdingShaman.java index f7684594a6..33dcd37817 100644 --- a/Mage.Sets/src/mage/cards/w/WeirdingShaman.java +++ b/Mage.Sets/src/mage/cards/w/WeirdingShaman.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.GoblinRogueToken; import mage.target.common.TargetControlledPermanent; @@ -27,7 +26,7 @@ public final class WeirdingShaman extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Goblin"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public WeirdingShaman(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WellgabberApothecary.java b/Mage.Sets/src/mage/cards/w/WellgabberApothecary.java index 26800c0af0..e759a4cc0b 100644 --- a/Mage.Sets/src/mage/cards/w/WellgabberApothecary.java +++ b/Mage.Sets/src/mage/cards/w/WellgabberApothecary.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetCreaturePermanent; @@ -28,7 +27,7 @@ public final class WellgabberApothecary extends CardImpl { static { filter.add(TappedPredicate.instance); - filter.add(Predicates.or(new SubtypePredicate(SubType.MERFOLK), new SubtypePredicate(SubType.KITHKIN))); + filter.add(Predicates.or(SubType.MERFOLK.getPredicate(), SubType.KITHKIN.getPredicate())); } public WellgabberApothecary(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/Wellwisher.java b/Mage.Sets/src/mage/cards/w/Wellwisher.java index bc8fb175c5..1ba51e81bf 100644 --- a/Mage.Sets/src/mage/cards/w/Wellwisher.java +++ b/Mage.Sets/src/mage/cards/w/Wellwisher.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,7 +23,7 @@ public final class Wellwisher extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Elf on the battlefield"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public Wellwisher(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WhelmingWave.java b/Mage.Sets/src/mage/cards/w/WhelmingWave.java index 244f84fa1e..a02dfdadb2 100644 --- a/Mage.Sets/src/mage/cards/w/WhelmingWave.java +++ b/Mage.Sets/src/mage/cards/w/WhelmingWave.java @@ -10,7 +10,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,10 +21,10 @@ public final class WhelmingWave extends CardImpl { static { filter.add(Predicates.not( Predicates.or( - new SubtypePredicate(SubType.KRAKEN), - new SubtypePredicate(SubType.LEVIATHAN), - new SubtypePredicate(SubType.OCTOPUS), - new SubtypePredicate(SubType.SERPENT)))); + SubType.KRAKEN.getPredicate(), + SubType.LEVIATHAN.getPredicate(), + SubType.OCTOPUS.getPredicate(), + SubType.SERPENT.getPredicate()))); } public WhelmingWave(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WhipgrassEntangler.java b/Mage.Sets/src/mage/cards/w/WhipgrassEntangler.java index 35da49dc43..3eba5d8381 100644 --- a/Mage.Sets/src/mage/cards/w/WhipgrassEntangler.java +++ b/Mage.Sets/src/mage/cards/w/WhipgrassEntangler.java @@ -18,7 +18,6 @@ import mage.constants.SubType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -62,7 +61,7 @@ class WhipgrassEntanglerCantAttackUnlessYouPayEffect extends CantAttackBlockUnle private static final FilterPermanent filter = new FilterPermanent("Cleric on the battlefield"); static { - filter.add(new SubtypePredicate(SubType.CLERIC)); + filter.add(SubType.CLERIC.getPredicate()); } WhipgrassEntanglerCantAttackUnlessYouPayEffect() { diff --git a/Mage.Sets/src/mage/cards/w/WildNacatl.java b/Mage.Sets/src/mage/cards/w/WildNacatl.java index c31aecac12..fbdfc07476 100644 --- a/Mage.Sets/src/mage/cards/w/WildNacatl.java +++ b/Mage.Sets/src/mage/cards/w/WildNacatl.java @@ -12,7 +12,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -24,8 +23,8 @@ public final class WildNacatl extends CardImpl { private static final FilterPermanent filter2 = new FilterPermanent("Plains"); static { - filter1.add(new SubtypePredicate(SubType.MOUNTAIN)); - filter2.add(new SubtypePredicate(SubType.PLAINS)); + filter1.add(SubType.MOUNTAIN.getPredicate()); + filter2.add(SubType.PLAINS.getPredicate()); } public WildNacatl(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WildbornPreserver.java b/Mage.Sets/src/mage/cards/w/WildbornPreserver.java index b6429ccdda..0fe9b9256a 100644 --- a/Mage.Sets/src/mage/cards/w/WildbornPreserver.java +++ b/Mage.Sets/src/mage/cards/w/WildbornPreserver.java @@ -21,7 +21,6 @@ import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -38,7 +37,7 @@ public final class WildbornPreserver extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(Predicates.not(new SubtypePredicate(SubType.HUMAN))); + filter.add(Predicates.not(SubType.HUMAN.getPredicate())); } public WildbornPreserver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WildwoodTracker.java b/Mage.Sets/src/mage/cards/w/WildwoodTracker.java index 8722bc8248..28ab06ef89 100644 --- a/Mage.Sets/src/mage/cards/w/WildwoodTracker.java +++ b/Mage.Sets/src/mage/cards/w/WildwoodTracker.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import java.util.UUID; @@ -28,7 +27,7 @@ public final class WildwoodTracker extends CardImpl { static { filter.add(AnotherPredicate.instance); - filter.add(Predicates.not(new SubtypePredicate(SubType.HUMAN))); + filter.add(Predicates.not(SubType.HUMAN.getPredicate())); } private static final Condition condition = new PermanentsOnTheBattlefieldCondition(filter); diff --git a/Mage.Sets/src/mage/cards/w/WillowPriestess.java b/Mage.Sets/src/mage/cards/w/WillowPriestess.java index 88af9c98fe..4fbc96e4e3 100644 --- a/Mage.Sets/src/mage/cards/w/WillowPriestess.java +++ b/Mage.Sets/src/mage/cards/w/WillowPriestess.java @@ -20,7 +20,6 @@ import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.Target; import mage.target.TargetPermanent; @@ -34,7 +33,7 @@ public final class WillowPriestess extends CardImpl { private static final FilterCreaturePermanent greenCreature = new FilterCreaturePermanent("green creature"); static { - filter.add(new SubtypePredicate(SubType.FAERIE)); + filter.add(SubType.FAERIE.getPredicate()); greenCreature.add(new ColorPredicate(ObjectColor.GREEN)); } diff --git a/Mage.Sets/src/mage/cards/w/WingSplicer.java b/Mage.Sets/src/mage/cards/w/WingSplicer.java index 0821a5ea7e..7e59bf2d50 100644 --- a/Mage.Sets/src/mage/cards/w/WingSplicer.java +++ b/Mage.Sets/src/mage/cards/w/WingSplicer.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.GolemToken; /** @@ -28,7 +27,7 @@ public final class WingSplicer extends CardImpl { static { filter.add(CardType.CREATURE.getPredicate()); - filter.add(new SubtypePredicate(SubType.GOLEM)); + filter.add(SubType.GOLEM.getPredicate()); } public WingSplicer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WingedSliver.java b/Mage.Sets/src/mage/cards/w/WingedSliver.java index 3b1f30bb7b..9499db385e 100644 --- a/Mage.Sets/src/mage/cards/w/WingedSliver.java +++ b/Mage.Sets/src/mage/cards/w/WingedSliver.java @@ -13,7 +13,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @author Loki @@ -23,7 +22,7 @@ public final class WingedSliver extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("All sliver creatures"); static { - filter.add(new SubtypePredicate(SubType.SLIVER)); + filter.add(SubType.SLIVER.getPredicate()); } public WingedSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WirewoodChanneler.java b/Mage.Sets/src/mage/cards/w/WirewoodChanneler.java index 268e42b4f2..6d6b91aa23 100644 --- a/Mage.Sets/src/mage/cards/w/WirewoodChanneler.java +++ b/Mage.Sets/src/mage/cards/w/WirewoodChanneler.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -23,7 +22,7 @@ public final class WirewoodChanneler extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Elves"); static { - filter.add(new SubtypePredicate((SubType.ELF))); + filter.add(SubType.ELF.getPredicate()); } public WirewoodChanneler(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WirewoodHerald.java b/Mage.Sets/src/mage/cards/w/WirewoodHerald.java index 402c145b1a..c55fdbfb25 100644 --- a/Mage.Sets/src/mage/cards/w/WirewoodHerald.java +++ b/Mage.Sets/src/mage/cards/w/WirewoodHerald.java @@ -10,7 +10,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; /** @@ -22,7 +21,7 @@ public final class WirewoodHerald extends CardImpl { private static final FilterCard filter = new FilterCard("Elf card"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public WirewoodHerald(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WirewoodHivemaster.java b/Mage.Sets/src/mage/cards/w/WirewoodHivemaster.java index 87d646142a..2e4f2a481e 100644 --- a/Mage.Sets/src/mage/cards/w/WirewoodHivemaster.java +++ b/Mage.Sets/src/mage/cards/w/WirewoodHivemaster.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; import mage.game.permanent.token.InsectToken; @@ -25,7 +24,7 @@ public final class WirewoodHivemaster extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another nontoken Elf"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); filter.add(AnotherPredicate.instance); filter.add(Predicates.not(TokenPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/w/WirewoodLodge.java b/Mage.Sets/src/mage/cards/w/WirewoodLodge.java index 57a4a3fa67..074e090724 100644 --- a/Mage.Sets/src/mage/cards/w/WirewoodLodge.java +++ b/Mage.Sets/src/mage/cards/w/WirewoodLodge.java @@ -14,7 +14,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -26,7 +25,7 @@ public final class WirewoodLodge extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Elf"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public WirewoodLodge(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WirewoodPride.java b/Mage.Sets/src/mage/cards/w/WirewoodPride.java index 4f327dc327..2cb35c7bfa 100644 --- a/Mage.Sets/src/mage/cards/w/WirewoodPride.java +++ b/Mage.Sets/src/mage/cards/w/WirewoodPride.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -22,7 +21,7 @@ public final class WirewoodPride extends CardImpl { private static final FilterCreaturePermanent elfCount = new FilterCreaturePermanent("Elves"); static { - elfCount.add(new SubtypePredicate(SubType.ELF)); + elfCount.add(SubType.ELF.getPredicate()); } public WirewoodPride(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WirewoodSavage.java b/Mage.Sets/src/mage/cards/w/WirewoodSavage.java index 3d89219691..55fa3cb7d7 100644 --- a/Mage.Sets/src/mage/cards/w/WirewoodSavage.java +++ b/Mage.Sets/src/mage/cards/w/WirewoodSavage.java @@ -11,7 +11,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -22,7 +21,7 @@ public final class WirewoodSavage extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("a Beast"); static { - filter.add(new SubtypePredicate(SubType.BEAST)); + filter.add(SubType.BEAST.getPredicate()); } public WirewoodSavage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WirewoodSymbiote.java b/Mage.Sets/src/mage/cards/w/WirewoodSymbiote.java index 5234a0bffe..d8d7c620f7 100644 --- a/Mage.Sets/src/mage/cards/w/WirewoodSymbiote.java +++ b/Mage.Sets/src/mage/cards/w/WirewoodSymbiote.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -26,7 +25,7 @@ public final class WirewoodSymbiote extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Elf"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public WirewoodSymbiote(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WitchsVengeance.java b/Mage.Sets/src/mage/cards/w/WitchsVengeance.java index c75558b519..12f6e0acc9 100644 --- a/Mage.Sets/src/mage/cards/w/WitchsVengeance.java +++ b/Mage.Sets/src/mage/cards/w/WitchsVengeance.java @@ -11,7 +11,6 @@ import mage.constants.Duration; import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; @@ -66,7 +65,7 @@ class WitchsVengeanceEffect extends OneShotEffect { return false; } FilterCreaturePermanent filter = new FilterCreaturePermanent(); - filter.add(new SubtypePredicate(SubType.byDescription(choice.getChoice()))); + filter.add(SubType.byDescription(choice.getChoice()).getPredicate()); game.addEffect(new BoostAllEffect( -3, -3, Duration.EndOfTurn, filter, false ), source); diff --git a/Mage.Sets/src/mage/cards/w/WitheringGaze.java b/Mage.Sets/src/mage/cards/w/WitheringGaze.java index 41d77f3434..2a0c3b8ff4 100644 --- a/Mage.Sets/src/mage/cards/w/WitheringGaze.java +++ b/Mage.Sets/src/mage/cards/w/WitheringGaze.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; @@ -51,7 +50,7 @@ class WitheringGazeEffect extends OneShotEffect { private static final FilterCard filter = new FilterCard("Forest or green card"); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.FOREST), + filter.add(Predicates.or(SubType.FOREST.getPredicate(), new ColorPredicate(ObjectColor.GREEN))); } diff --git a/Mage.Sets/src/mage/cards/w/WitheringWisps.java b/Mage.Sets/src/mage/cards/w/WitheringWisps.java index 2e275880e6..6f58d36218 100644 --- a/Mage.Sets/src/mage/cards/w/WitheringWisps.java +++ b/Mage.Sets/src/mage/cards/w/WitheringWisps.java @@ -20,7 +20,6 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -59,7 +58,7 @@ class WitheringWispsActivatedAbility extends ActivatedAbilityImpl { static { filter.add(new SupertypePredicate(SuperType.SNOW)); - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/w/WizardsLightning.java b/Mage.Sets/src/mage/cards/w/WizardsLightning.java index 4853118a50..b13e313de1 100644 --- a/Mage.Sets/src/mage/cards/w/WizardsLightning.java +++ b/Mage.Sets/src/mage/cards/w/WizardsLightning.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetAnyTarget; /** * @@ -24,7 +23,7 @@ public final class WizardsLightning extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("you control a Wizard"); static { - filter.add(new SubtypePredicate(SubType.WIZARD)); + filter.add(SubType.WIZARD.getPredicate()); } public WizardsLightning(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WizardsRetort.java b/Mage.Sets/src/mage/cards/w/WizardsRetort.java index 810e45a06c..aecee64c22 100644 --- a/Mage.Sets/src/mage/cards/w/WizardsRetort.java +++ b/Mage.Sets/src/mage/cards/w/WizardsRetort.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetSpell; /** @@ -25,7 +24,7 @@ public final class WizardsRetort extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("you control a Wizard"); static { - filter.add(new SubtypePredicate(SubType.WIZARD)); + filter.add(SubType.WIZARD.getPredicate()); } public WizardsRetort(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WizenedCenn.java b/Mage.Sets/src/mage/cards/w/WizenedCenn.java index 805dbd7fdd..e9feaf8cc8 100644 --- a/Mage.Sets/src/mage/cards/w/WizenedCenn.java +++ b/Mage.Sets/src/mage/cards/w/WizenedCenn.java @@ -12,7 +12,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -23,7 +22,7 @@ public final class WizenedCenn extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Kithkin creatures"); static { - filter.add(new SubtypePredicate(SubType.KITHKIN)); + filter.add(SubType.KITHKIN.getPredicate()); } public WizenedCenn(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java b/Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java index 8b7ea33c2e..eaaf610a30 100644 --- a/Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java +++ b/Mage.Sets/src/mage/cards/w/WolfhuntersQuiver.java @@ -15,7 +15,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetAnyTarget; import mage.target.common.TargetCreaturePermanent; @@ -28,7 +27,7 @@ public final class WolfhuntersQuiver extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Werewolf creature"); static { - filter.add(new SubtypePredicate(SubType.WEREWOLF)); + filter.add(SubType.WEREWOLF.getPredicate()); } public WolfhuntersQuiver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/Wonder.java b/Mage.Sets/src/mage/cards/w/Wonder.java index a55bddda60..dae8d243db 100644 --- a/Mage.Sets/src/mage/cards/w/Wonder.java +++ b/Mage.Sets/src/mage/cards/w/Wonder.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -31,7 +30,7 @@ public final class Wonder extends CardImpl { static { filter.add(CardType.LAND.getPredicate()); - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } public Wonder(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WoodElemental.java b/Mage.Sets/src/mage/cards/w/WoodElemental.java index 39c7218a3e..54142a0ac5 100644 --- a/Mage.Sets/src/mage/cards/w/WoodElemental.java +++ b/Mage.Sets/src/mage/cards/w/WoodElemental.java @@ -20,7 +20,6 @@ import mage.constants.SubLayer; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -63,7 +62,7 @@ class WoodElementalEffect extends OneShotEffect { static { filter.add(Predicates.not(TappedPredicate.instance)); - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public WoodElementalEffect() { diff --git a/Mage.Sets/src/mage/cards/w/WoodElves.java b/Mage.Sets/src/mage/cards/w/WoodElves.java index 199742a18c..e235e7415d 100644 --- a/Mage.Sets/src/mage/cards/w/WoodElves.java +++ b/Mage.Sets/src/mage/cards/w/WoodElves.java @@ -9,7 +9,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterLandCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; import java.util.UUID; @@ -22,7 +21,7 @@ public final class WoodElves extends CardImpl { private static final FilterLandCard filter = new FilterLandCard("Forest card"); static{ - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public WoodElves(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WoodlandCemetery.java b/Mage.Sets/src/mage/cards/w/WoodlandCemetery.java index 550805068e..80944d2860 100644 --- a/Mage.Sets/src/mage/cards/w/WoodlandCemetery.java +++ b/Mage.Sets/src/mage/cards/w/WoodlandCemetery.java @@ -15,7 +15,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import java.util.UUID; @@ -27,7 +26,7 @@ public final class WoodlandCemetery extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(Predicates.or(new SubtypePredicate(SubType.FOREST), new SubtypePredicate(SubType.SWAMP))); + filter.add(Predicates.or(SubType.FOREST.getPredicate(), SubType.SWAMP.getPredicate())); } public WoodlandCemetery(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WoodwraithCorrupter.java b/Mage.Sets/src/mage/cards/w/WoodwraithCorrupter.java index fb66c8dd42..a9b2cd6e0c 100644 --- a/Mage.Sets/src/mage/cards/w/WoodwraithCorrupter.java +++ b/Mage.Sets/src/mage/cards/w/WoodwraithCorrupter.java @@ -16,9 +16,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.TokenImpl; -import mage.game.permanent.token.Token; import mage.target.TargetPermanent; /** @@ -30,7 +28,7 @@ public final class WoodwraithCorrupter extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Forest"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public WoodwraithCorrupter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WordOfBlasting.java b/Mage.Sets/src/mage/cards/w/WordOfBlasting.java index ee30e19b78..ab984f5e14 100644 --- a/Mage.Sets/src/mage/cards/w/WordOfBlasting.java +++ b/Mage.Sets/src/mage/cards/w/WordOfBlasting.java @@ -11,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; /** @@ -23,7 +22,7 @@ public final class WordOfBlasting extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Wall"); static { - filter.add(new SubtypePredicate(SubType.WALL)); + filter.add(SubType.WALL.getPredicate()); } public WordOfBlasting(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WortBoggartAuntie.java b/Mage.Sets/src/mage/cards/w/WortBoggartAuntie.java index 855a87cb52..fb6b9eda0d 100644 --- a/Mage.Sets/src/mage/cards/w/WortBoggartAuntie.java +++ b/Mage.Sets/src/mage/cards/w/WortBoggartAuntie.java @@ -14,7 +14,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInYourGraveyard; /** @@ -26,7 +25,7 @@ public final class WortBoggartAuntie extends CardImpl { private static final FilterCard filter = new FilterCard("Goblin card from your graveyard"); static { - filter.add(new SubtypePredicate(SubType.GOBLIN)); + filter.add(SubType.GOBLIN.getPredicate()); } public WortBoggartAuntie(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WorthyKnight.java b/Mage.Sets/src/mage/cards/w/WorthyKnight.java index 636dbc351a..104ef4fc87 100644 --- a/Mage.Sets/src/mage/cards/w/WorthyKnight.java +++ b/Mage.Sets/src/mage/cards/w/WorthyKnight.java @@ -8,7 +8,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterSpell; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.HumanToken; import java.util.UUID; @@ -21,7 +20,7 @@ public final class WorthyKnight extends CardImpl { private static final FilterSpell filter = new FilterSpell("a Knight spell"); static { - filter.add(new SubtypePredicate(SubType.KNIGHT)); + filter.add(SubType.KNIGHT.getPredicate()); } public WorthyKnight(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WrensRunPackmaster.java b/Mage.Sets/src/mage/cards/w/WrensRunPackmaster.java index 2c5da003e4..db4aa91f81 100644 --- a/Mage.Sets/src/mage/cards/w/WrensRunPackmaster.java +++ b/Mage.Sets/src/mage/cards/w/WrensRunPackmaster.java @@ -15,7 +15,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.WolfToken; @@ -28,7 +27,7 @@ public final class WrensRunPackmaster extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Wolf"); static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.WOLF)); + filter.add(SubType.WOLF.getPredicate()); } public WrensRunPackmaster(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WrensRunVanquisher.java b/Mage.Sets/src/mage/cards/w/WrensRunVanquisher.java index e24a26f12c..4eee3a1b6f 100644 --- a/Mage.Sets/src/mage/cards/w/WrensRunVanquisher.java +++ b/Mage.Sets/src/mage/cards/w/WrensRunVanquisher.java @@ -12,7 +12,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInHand; /** @@ -23,7 +22,7 @@ public final class WrensRunVanquisher extends CardImpl { private static final FilterCard filter = new FilterCard("an Elf card from your hand"); static { - filter.add(new SubtypePredicate(SubType.ELF)); + filter.add(SubType.ELF.getPredicate()); } public WrensRunVanquisher(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WretchedCamel.java b/Mage.Sets/src/mage/cards/w/WretchedCamel.java index f4218eff05..195f091fa0 100644 --- a/Mage.Sets/src/mage/cards/w/WretchedCamel.java +++ b/Mage.Sets/src/mage/cards/w/WretchedCamel.java @@ -16,7 +16,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPlayer; /** @@ -29,8 +28,8 @@ public final class WretchedCamel extends CardImpl { private static final FilterCard filterDesertCard = new FilterCard("Desert card"); static { - filterDesertPermanent.add(new SubtypePredicate(SubType.DESERT)); - filterDesertCard.add(new SubtypePredicate(SubType.DESERT)); + filterDesertPermanent.add(SubType.DESERT.getPredicate()); + filterDesertCard.add(SubType.DESERT.getPredicate()); } public WretchedCamel(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/x/XathridNecromancer.java b/Mage.Sets/src/mage/cards/x/XathridNecromancer.java index 5b99f3aa25..7e5abfc080 100644 --- a/Mage.Sets/src/mage/cards/x/XathridNecromancer.java +++ b/Mage.Sets/src/mage/cards/x/XathridNecromancer.java @@ -13,7 +13,6 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.permanent.token.ZombieToken; @@ -27,7 +26,7 @@ public final class XathridNecromancer extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate(SubType.HUMAN)); + filter.add(SubType.HUMAN.getPredicate()); } public XathridNecromancer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/y/YavimayaDryad.java b/Mage.Sets/src/mage/cards/y/YavimayaDryad.java index 9890421bc8..f26347058e 100644 --- a/Mage.Sets/src/mage/cards/y/YavimayaDryad.java +++ b/Mage.Sets/src/mage/cards/y/YavimayaDryad.java @@ -15,7 +15,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; @@ -30,7 +29,7 @@ public final class YavimayaDryad extends CardImpl { private static final FilterLandCard filter = new FilterLandCard("a Forest card"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public YavimayaDryad(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/y/YukoraThePrisoner.java b/Mage.Sets/src/mage/cards/y/YukoraThePrisoner.java index f204f516fb..8979050010 100644 --- a/Mage.Sets/src/mage/cards/y/YukoraThePrisoner.java +++ b/Mage.Sets/src/mage/cards/y/YukoraThePrisoner.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -28,7 +27,7 @@ public final class YukoraThePrisoner extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("non-Ogre creatures"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.OGRE))); + filter.add(Predicates.not(SubType.OGRE.getPredicate())); } public YukoraThePrisoner(UUID ownerId, CardSetInfo setInfo) { @@ -60,7 +59,7 @@ class YukoraThePrisonerEffect extends OneShotEffect { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("non-Ogre creatures"); static { - filter.add(Predicates.not(new SubtypePredicate(SubType.OGRE))); + filter.add(Predicates.not(SubType.OGRE.getPredicate())); } public YukoraThePrisonerEffect() { diff --git a/Mage.Sets/src/mage/cards/z/ZadasCommando.java b/Mage.Sets/src/mage/cards/z/ZadasCommando.java index ee55962b5f..3bb9280e4c 100644 --- a/Mage.Sets/src/mage/cards/z/ZadasCommando.java +++ b/Mage.Sets/src/mage/cards/z/ZadasCommando.java @@ -17,7 +17,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetOpponentOrPlaneswalker; @@ -31,7 +30,7 @@ public final class ZadasCommando extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("an untapped Ally you control"); static { - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/z/ZhalfirinCommander.java b/Mage.Sets/src/mage/cards/z/ZhalfirinCommander.java index c98b505e27..4f0ae8c050 100644 --- a/Mage.Sets/src/mage/cards/z/ZhalfirinCommander.java +++ b/Mage.Sets/src/mage/cards/z/ZhalfirinCommander.java @@ -15,7 +15,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; /** @@ -27,7 +26,7 @@ public final class ZhalfirinCommander extends CardImpl { static final private FilterCreaturePermanent filter = new FilterCreaturePermanent("Knight creature"); static{ - filter.add(new SubtypePredicate(SubType.KNIGHT)); + filter.add(SubType.KNIGHT.getPredicate()); } public ZhalfirinCommander(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/z/ZirilanOfTheClaw.java b/Mage.Sets/src/mage/cards/z/ZirilanOfTheClaw.java index a014a518c6..cd88d8ad9e 100644 --- a/Mage.Sets/src/mage/cards/z/ZirilanOfTheClaw.java +++ b/Mage.Sets/src/mage/cards/z/ZirilanOfTheClaw.java @@ -19,7 +19,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.common.FilterPermanentCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -78,7 +77,7 @@ class ZirilanOfTheClawEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { FilterPermanentCard filter = new FilterPermanentCard("a Dragon permanent card"); - filter.add(new SubtypePredicate(SubType.DRAGON)); + filter.add(SubType.DRAGON.getPredicate()); TargetCardInLibrary target = new TargetCardInLibrary(filter); if (controller.searchLibrary(target, source, game)) { Card card = controller.getLibrary().getCard(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/z/ZombieApocalypse.java b/Mage.Sets/src/mage/cards/z/ZombieApocalypse.java index 1c3e73af74..530bd9e7a1 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieApocalypse.java +++ b/Mage.Sets/src/mage/cards/z/ZombieApocalypse.java @@ -12,7 +12,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreatureCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -45,7 +44,7 @@ class ZombieApocalypseEffect extends OneShotEffect { private static final FilterCreatureCard filterZombie = new FilterCreatureCard(); static { - filterZombie.add(new SubtypePredicate(SubType.ZOMBIE)); + filterZombie.add(SubType.ZOMBIE.getPredicate()); } public ZombieApocalypseEffect() { diff --git a/Mage.Sets/src/mage/cards/z/ZombieMaster.java b/Mage.Sets/src/mage/cards/z/ZombieMaster.java index 6ea07c84d7..6697439a08 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieMaster.java +++ b/Mage.Sets/src/mage/cards/z/ZombieMaster.java @@ -17,7 +17,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -29,7 +28,7 @@ public final class ZombieMaster extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Zombie creatures"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } public ZombieMaster(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/z/ZombieTrailblazer.java b/Mage.Sets/src/mage/cards/z/ZombieTrailblazer.java index 6e8358a724..6387b7b04a 100644 --- a/Mage.Sets/src/mage/cards/z/ZombieTrailblazer.java +++ b/Mage.Sets/src/mage/cards/z/ZombieTrailblazer.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetCreaturePermanent; @@ -33,7 +32,7 @@ public final class ZombieTrailblazer extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("an untapped Zombie you control"); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Sets/src/mage/cards/z/ZulaportChainmage.java b/Mage.Sets/src/mage/cards/z/ZulaportChainmage.java index 0ad6f5d0ab..ad7ecc941d 100644 --- a/Mage.Sets/src/mage/cards/z/ZulaportChainmage.java +++ b/Mage.Sets/src/mage/cards/z/ZulaportChainmage.java @@ -15,7 +15,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetOpponent; @@ -29,7 +28,7 @@ public final class ZulaportChainmage extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Ally you control"); static { - filter.add(new SubtypePredicate(SubType.ALLY)); + filter.add(SubType.ALLY.getPredicate()); filter.add(Predicates.not(TappedPredicate.instance)); } diff --git a/Mage.Tests/src/test/java/org/mage/test/multiplayer/SimpleGameTest.java b/Mage.Tests/src/test/java/org/mage/test/multiplayer/SimpleGameTest.java index d4090015b8..ddc700d6db 100644 --- a/Mage.Tests/src/test/java/org/mage/test/multiplayer/SimpleGameTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/multiplayer/SimpleGameTest.java @@ -5,7 +5,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.Permanent; import org.junit.Assert; import org.junit.Test; @@ -36,7 +35,7 @@ public class SimpleGameTest extends CardTestMultiPlayerBase { assertLife(playerD, 20); FilterPermanent filterPermanent = new FilterLandPermanent(); - filterPermanent.add(new SubtypePredicate(SubType.FOREST)); + filterPermanent.add(SubType.FOREST.getPredicate()); List forestCards = currentGame.getBattlefield().getAllActivePermanents(filterPermanent, currentGame); Assert.assertEquals(4, forestCards.size()); } diff --git a/Mage/src/main/java/mage/abilities/common/FetchLandActivatedAbility.java b/Mage/src/main/java/mage/abilities/common/FetchLandActivatedAbility.java index 5707b8d7c3..1e477edf74 100644 --- a/Mage/src/main/java/mage/abilities/common/FetchLandActivatedAbility.java +++ b/Mage/src/main/java/mage/abilities/common/FetchLandActivatedAbility.java @@ -15,7 +15,6 @@ import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; import java.util.ArrayList; @@ -44,7 +43,7 @@ public class FetchLandActivatedAbility extends ActivatedAbilityImpl { filter.add(CardType.LAND.getPredicate()); List> subtypePredicates = new ArrayList<>(); for (SubType subtype : subtypes) { - subtypePredicates.add(new SubtypePredicate(subtype)); + subtypePredicates.add(subtype.getPredicate()); } filter.add(Predicates.or(subtypePredicates)); TargetCardInLibrary target = new TargetCardInLibrary(filter); diff --git a/Mage/src/main/java/mage/abilities/condition/common/EnchantedCreatureSubtypeCondition.java b/Mage/src/main/java/mage/abilities/condition/common/EnchantedCreatureSubtypeCondition.java index 752f20abdd..434dcc8359 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/EnchantedCreatureSubtypeCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/EnchantedCreatureSubtypeCondition.java @@ -6,7 +6,6 @@ import mage.abilities.condition.Condition; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -19,7 +18,7 @@ public class EnchantedCreatureSubtypeCondition implements Condition { private final FilterPermanent filter = new FilterCreaturePermanent(); public EnchantedCreatureSubtypeCondition(SubType string) { - filter.add(new SubtypePredicate(string)); + filter.add(string.getPredicate()); } @Override diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/GateYouControlCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/GateYouControlCount.java index 11fe8edcb2..2045cdfac2 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/GateYouControlCount.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/GateYouControlCount.java @@ -6,7 +6,6 @@ import mage.abilities.effects.Effect; import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; /** @@ -18,7 +17,7 @@ public enum GateYouControlCount implements DynamicValue { private static final FilterPermanent filter = new FilterControlledPermanent("Gate you control"); static { - filter.add(new SubtypePredicate(SubType.GATE)); + filter.add(SubType.GATE.getPredicate()); } @Override diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/UrzaTerrainValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/UrzaTerrainValue.java index 9bf15864df..d5d6fbbdc0 100644 --- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/UrzaTerrainValue.java +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/UrzaTerrainValue.java @@ -5,7 +5,6 @@ import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; public class UrzaTerrainValue implements DynamicValue { @@ -19,24 +18,24 @@ public class UrzaTerrainValue implements DynamicValue { @Override public int calculate(Game game, Ability sourceAbility, Effect effect) { FilterControlledPermanent pp = new FilterControlledPermanent("Urza's Power Plant"); - pp.add(new SubtypePredicate(SubType.URZAS)); - pp.add(new SubtypePredicate(SubType.POWER_PLANT)); + pp.add(SubType.URZAS.getPredicate()); + pp.add(SubType.POWER_PLANT.getPredicate()); PermanentsOnBattlefieldCount ppP = new PermanentsOnBattlefieldCount(pp); if (ppP.calculate(game, sourceAbility, effect) < 1) { return 1; } FilterControlledPermanent to = new FilterControlledPermanent("Urza's Tower"); - to.add(new SubtypePredicate(SubType.URZAS)); - to.add(new SubtypePredicate(SubType.TOWER)); + to.add(SubType.URZAS.getPredicate()); + to.add(SubType.TOWER.getPredicate()); PermanentsOnBattlefieldCount toP = new PermanentsOnBattlefieldCount(to); if (toP.calculate(game, sourceAbility, effect) < 1) { return 1; } FilterControlledPermanent mi = new FilterControlledPermanent("Urza's Mine"); - mi.add(new SubtypePredicate(SubType.URZAS)); - mi.add(new SubtypePredicate(SubType.MINE)); + mi.add(SubType.URZAS.getPredicate()); + mi.add(SubType.MINE.getPredicate()); PermanentsOnBattlefieldCount miP = new PermanentsOnBattlefieldCount(mi); if (miP.calculate(game, sourceAbility, effect) < 1) { return 1; diff --git a/Mage/src/main/java/mage/abilities/effects/common/AmplifyEffect.java b/Mage/src/main/java/mage/abilities/effects/common/AmplifyEffect.java index ab6f7d5c28..81eab7e767 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/AmplifyEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/AmplifyEffect.java @@ -16,7 +16,6 @@ import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.EntersTheBattlefieldEvent; import mage.game.events.GameEvent; @@ -29,7 +28,7 @@ import java.util.List; /** * Effect for the AmplifyAbility - * + *

* 702.37. Amplify 702.37a Amplify is a static ability. “Amplify N” means “As * this object enters the battlefield, reveal any number of cards from your hand * that share a creature type with it. This permanent enters the battlefield @@ -38,7 +37,6 @@ import java.util.List; * time as this card.” 702.37b If a creature has multiple instances of amplify, * each one works separately. * - * * @author FenrisulfrX */ public class AmplifyEffect extends ReplacementEffectImpl { @@ -101,9 +99,9 @@ public class AmplifyEffect extends ReplacementEffectImpl { Player controller = game.getPlayer(source.getControllerId()); if (controller != null && sourceCreature != null) { FilterCreatureCard filter = new FilterCreatureCard("creatures cards to reveal"); - List filterSubtypes = new ArrayList<>(); + List filterSubtypes = new ArrayList<>(); for (SubType subtype : sourceCreature.getSubtype(game)) { - filterSubtypes.add(new SubtypePredicate(subtype)); + filterSubtypes.add(subtype.getPredicate()); } if (filterSubtypes.size() > 1) { filter.add(Predicates.or(filterSubtypes)); diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/ExchangeControlTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/ExchangeControlTargetEffect.java index 37c32f864a..ecdac7e667 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/ExchangeControlTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/ExchangeControlTargetEffect.java @@ -15,7 +15,6 @@ import mage.constants.Outcome; import mage.constants.SubLayer; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -127,7 +126,7 @@ public class ExchangeControlTargetEffect extends ContinuousEffectImpl { permanent.getAbilities().setControllerId(lockedControllers.get(permanent.getId())); if (destroyAttachedAuras) { FilterPermanent filter = new FilterPermanent(); - filter.add(new SubtypePredicate(SubType.AURA)); + filter.add(SubType.AURA.getPredicate()); for (UUID attachmentId : new HashSet<>(permanent.getAttachments())) { Permanent attachment = game.getPermanent(attachmentId); if (attachment != null && filter.match(attachment, game)) { diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/AmassEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/AmassEffect.java index 2ad1b35fd1..f443ca65bc 100644 --- a/Mage/src/main/java/mage/abilities/effects/keyword/AmassEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/keyword/AmassEffect.java @@ -10,7 +10,6 @@ import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.ZombieArmyToken; @@ -29,7 +28,7 @@ public class AmassEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterControlledPermanent("Army you control"); static { - filter.add(new SubtypePredicate(SubType.ARMY)); + filter.add(SubType.ARMY.getPredicate()); } private final DynamicValue amassNumber; diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/SweepEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/SweepEffect.java index 5977477f14..afb6d29d34 100644 --- a/Mage/src/main/java/mage/abilities/effects/keyword/SweepEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/keyword/SweepEffect.java @@ -9,7 +9,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.players.Player; import mage.target.Target; @@ -45,7 +44,7 @@ public class SweepEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { FilterPermanent filter = new FilterControlledLandPermanent("any number of " + sweepSubtype + "s you control"); - filter.add(new SubtypePredicate(sweepSubtype)); + filter.add(sweepSubtype.getPredicate()); Target target = new TargetPermanent(0, Integer.MAX_VALUE, filter, true); if (controller.chooseTarget(outcome, target, source, game)) { game.getState().setValue(CardUtil.getCardZoneString("sweep", source.getSourceId(), game), target.getTargets().size()); diff --git a/Mage/src/main/java/mage/abilities/keyword/AffinityForLandTypeAbility.java b/Mage/src/main/java/mage/abilities/keyword/AffinityForLandTypeAbility.java index 3dde89731e..d12905a4b9 100644 --- a/Mage/src/main/java/mage/abilities/keyword/AffinityForLandTypeAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/AffinityForLandTypeAbility.java @@ -7,7 +7,6 @@ import mage.abilities.hint.ValueHint; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @author LevelX2 @@ -32,7 +31,7 @@ public class AffinityForLandTypeAbility extends SimpleStaticAbility { private static FilterControlledPermanent getFilter(SubType landType) { FilterControlledPermanent affinityfilter = new FilterControlledPermanent(); - affinityfilter.add(new SubtypePredicate(landType)); + affinityfilter.add(landType.getPredicate()); return affinityfilter; } diff --git a/Mage/src/main/java/mage/abilities/keyword/AuraSwapAbility.java b/Mage/src/main/java/mage/abilities/keyword/AuraSwapAbility.java index 8e44391643..a931e8e783 100644 --- a/Mage/src/main/java/mage/abilities/keyword/AuraSwapAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/AuraSwapAbility.java @@ -10,7 +10,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.other.AuraCardCanAttachToPermanentId; import mage.game.Game; import mage.game.permanent.Permanent; @@ -63,7 +62,7 @@ class AuraSwapEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { FilterCard filterCardToCheck = new FilterCard(); - filterCardToCheck.add(new SubtypePredicate(SubType.AURA)); + filterCardToCheck.add(SubType.AURA.getPredicate()); Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { Permanent auraSourcePermanent = game.getPermanent(source.getSourceId()); diff --git a/Mage/src/main/java/mage/abilities/keyword/ChampionAbility.java b/Mage/src/main/java/mage/abilities/keyword/ChampionAbility.java index 141af1bd3a..25b8471487 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ChampionAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ChampionAbility.java @@ -21,7 +21,6 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -79,7 +78,7 @@ public class ChampionAbility extends StaticAbility { if (!subtypes.isEmpty()) { int i = 0; for (SubType subtype : this.subtypes) { - subtypesPredicates.add(new SubtypePredicate(subtype)); + subtypesPredicates.add(subtype.getPredicate()); if (i == 0) { sb.append(subtype); } else { diff --git a/Mage/src/main/java/mage/abilities/keyword/ForestcyclingAbility.java b/Mage/src/main/java/mage/abilities/keyword/ForestcyclingAbility.java index c8ff441e0f..8f35e1c7bf 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ForestcyclingAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ForestcyclingAbility.java @@ -5,7 +5,6 @@ package mage.abilities.keyword; import mage.abilities.costs.mana.ManaCosts; import mage.constants.SubType; import mage.filter.common.FilterLandCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -15,7 +14,7 @@ public class ForestcyclingAbility extends CyclingAbility{ private static final FilterLandCard filter = new FilterLandCard("Forest card"); private static final String text = "Forestcycling"; static{ - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public ForestcyclingAbility(ManaCosts costs) { diff --git a/Mage/src/main/java/mage/abilities/keyword/ForestwalkAbility.java b/Mage/src/main/java/mage/abilities/keyword/ForestwalkAbility.java index 657ff1f03a..fb7e8edda2 100644 --- a/Mage/src/main/java/mage/abilities/keyword/ForestwalkAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/ForestwalkAbility.java @@ -3,7 +3,6 @@ package mage.abilities.keyword; import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -14,7 +13,7 @@ public class ForestwalkAbility extends LandwalkAbility { private static final FilterLandPermanent filter = new FilterLandPermanent("forest"); static { - filter.add(new SubtypePredicate(SubType.FOREST)); + filter.add(SubType.FOREST.getPredicate()); } public ForestwalkAbility() { diff --git a/Mage/src/main/java/mage/abilities/keyword/IslandcyclingAbility.java b/Mage/src/main/java/mage/abilities/keyword/IslandcyclingAbility.java index 6e4de1bff5..b15bf92eb3 100644 --- a/Mage/src/main/java/mage/abilities/keyword/IslandcyclingAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/IslandcyclingAbility.java @@ -5,7 +5,6 @@ package mage.abilities.keyword; import mage.abilities.costs.mana.ManaCosts; import mage.constants.SubType; import mage.filter.common.FilterLandCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -15,7 +14,7 @@ public class IslandcyclingAbility extends CyclingAbility{ private static final FilterLandCard filter = new FilterLandCard("Island card"); private static final String text = "Islandcycling"; static{ - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } public IslandcyclingAbility(ManaCosts costs) { diff --git a/Mage/src/main/java/mage/abilities/keyword/IslandwalkAbility.java b/Mage/src/main/java/mage/abilities/keyword/IslandwalkAbility.java index 7f607a2dd2..f92d0de7a8 100644 --- a/Mage/src/main/java/mage/abilities/keyword/IslandwalkAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/IslandwalkAbility.java @@ -3,7 +3,6 @@ package mage.abilities.keyword; import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -14,7 +13,7 @@ public class IslandwalkAbility extends LandwalkAbility { private static final FilterLandPermanent filter = new FilterLandPermanent("island"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } public IslandwalkAbility() { diff --git a/Mage/src/main/java/mage/abilities/keyword/MountaincyclingAbility.java b/Mage/src/main/java/mage/abilities/keyword/MountaincyclingAbility.java index fbe64609a2..54b8734346 100644 --- a/Mage/src/main/java/mage/abilities/keyword/MountaincyclingAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/MountaincyclingAbility.java @@ -5,7 +5,6 @@ package mage.abilities.keyword; import mage.abilities.costs.mana.ManaCosts; import mage.constants.SubType; import mage.filter.common.FilterLandCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -15,7 +14,7 @@ public class MountaincyclingAbility extends CyclingAbility{ private static final FilterLandCard filter = new FilterLandCard("Mountain card"); private static final String text = "Mountaincycling"; static{ - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public MountaincyclingAbility(ManaCosts costs) { diff --git a/Mage/src/main/java/mage/abilities/keyword/MountainwalkAbility.java b/Mage/src/main/java/mage/abilities/keyword/MountainwalkAbility.java index 1487eece6b..2fa97af410 100644 --- a/Mage/src/main/java/mage/abilities/keyword/MountainwalkAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/MountainwalkAbility.java @@ -3,7 +3,6 @@ package mage.abilities.keyword; import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -14,7 +13,7 @@ public class MountainwalkAbility extends LandwalkAbility { private static final FilterLandPermanent filter = new FilterLandPermanent("mountain"); static { - filter.add(new SubtypePredicate(SubType.MOUNTAIN)); + filter.add(SubType.MOUNTAIN.getPredicate()); } public MountainwalkAbility() { diff --git a/Mage/src/main/java/mage/abilities/keyword/OfferingAbility.java b/Mage/src/main/java/mage/abilities/keyword/OfferingAbility.java index e4cf7c34a0..9dbbdb3c03 100644 --- a/Mage/src/main/java/mage/abilities/keyword/OfferingAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/OfferingAbility.java @@ -10,7 +10,6 @@ import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.cards.Card; import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -48,7 +47,7 @@ public class OfferingAbility extends StaticAbility { */ public OfferingAbility(SubType subtype) { super(Zone.ALL, null); - filter.add(new SubtypePredicate(subtype)); + filter.add(subtype.getPredicate()); filter.setMessage(subtype.getDescription()); this.addEffect(new OfferingAsThoughEffect()); } diff --git a/Mage/src/main/java/mage/abilities/keyword/PlainscyclingAbility.java b/Mage/src/main/java/mage/abilities/keyword/PlainscyclingAbility.java index 6017d60a7a..65aefa36ef 100644 --- a/Mage/src/main/java/mage/abilities/keyword/PlainscyclingAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/PlainscyclingAbility.java @@ -5,7 +5,6 @@ package mage.abilities.keyword; import mage.abilities.costs.mana.ManaCosts; import mage.constants.SubType; import mage.filter.common.FilterLandCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -15,7 +14,7 @@ public class PlainscyclingAbility extends CyclingAbility{ private static final FilterLandCard filter = new FilterLandCard("Plains card"); private static final String text = "Plainscycling"; static{ - filter.add(new SubtypePredicate(SubType.PLAINS)); + filter.add(SubType.PLAINS.getPredicate()); } public PlainscyclingAbility(ManaCosts costs) { diff --git a/Mage/src/main/java/mage/abilities/keyword/PlainswalkAbility.java b/Mage/src/main/java/mage/abilities/keyword/PlainswalkAbility.java index 8ceba88df1..9a5588fc8f 100644 --- a/Mage/src/main/java/mage/abilities/keyword/PlainswalkAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/PlainswalkAbility.java @@ -3,7 +3,6 @@ package mage.abilities.keyword; import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -14,7 +13,7 @@ public class PlainswalkAbility extends LandwalkAbility { private static final FilterLandPermanent filter = new FilterLandPermanent("plains"); static { - filter.add(new SubtypePredicate(SubType.PLAINS)); + filter.add(SubType.PLAINS.getPredicate()); } public PlainswalkAbility() { diff --git a/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java b/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java index 90bea4bb88..0ccefbb914 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java @@ -10,7 +10,6 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.target.common.TargetCardInYourGraveyard; @@ -52,7 +51,7 @@ public class SoulshiftAbility extends DiesTriggeredAbility { int intValue = amount.calculate(game, this, null); FilterCard filter = new FilterCard("Spirit card with converted mana cost " + intValue + " or less from your graveyard"); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, intValue + 1)); - filter.add(new SubtypePredicate(SubType.SPIRIT)); + filter.add(SubType.SPIRIT.getPredicate()); this.addTarget(new TargetCardInYourGraveyard(filter)); super.trigger(game, controllerId); //To change body of generated methods, choose Tools | Templates. } diff --git a/Mage/src/main/java/mage/abilities/keyword/SwampcyclingAbility.java b/Mage/src/main/java/mage/abilities/keyword/SwampcyclingAbility.java index e08bb4af89..7d990895b8 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SwampcyclingAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SwampcyclingAbility.java @@ -5,7 +5,6 @@ package mage.abilities.keyword; import mage.abilities.costs.mana.ManaCosts; import mage.constants.SubType; import mage.filter.common.FilterLandCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -16,7 +15,7 @@ public class SwampcyclingAbility extends CyclingAbility{ private static final FilterLandCard filter = new FilterLandCard("Swamp card"); private static final String text = "Swampcycling"; static{ - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public SwampcyclingAbility(ManaCosts costs) { super(costs, filter, text); diff --git a/Mage/src/main/java/mage/abilities/keyword/SwampwalkAbility.java b/Mage/src/main/java/mage/abilities/keyword/SwampwalkAbility.java index e31303fdfa..f0b54bdc7c 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SwampwalkAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SwampwalkAbility.java @@ -3,7 +3,6 @@ package mage.abilities.keyword; import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -14,7 +13,7 @@ public class SwampwalkAbility extends LandwalkAbility { private static final FilterLandPermanent filter = new FilterLandPermanent("swamp"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public SwampwalkAbility() { diff --git a/Mage/src/main/java/mage/constants/SubType.java b/Mage/src/main/java/mage/constants/SubType.java index 4f157b9562..4c495ad93b 100644 --- a/Mage/src/main/java/mage/constants/SubType.java +++ b/Mage/src/main/java/mage/constants/SubType.java @@ -1,5 +1,8 @@ package mage.constants; +import mage.MageObject; +import mage.filter.predicate.Predicate; +import mage.game.Game; import mage.util.SubTypeList; import java.util.Arrays; @@ -439,7 +442,30 @@ public enum SubType { YANLING("Yanling", SubTypeSet.PlaneswalkerType), YODA("Yoda", SubTypeSet.PlaneswalkerType, true); // Star Wars + public static class SubTypePredicate implements Predicate { + + private final SubType subtype; + + private SubTypePredicate(SubType subtype) { + this.subtype = subtype; + } + + + @Override + public boolean apply(MageObject input, Game game) { + return input.hasSubtype(subtype, game); + } + + @Override + public String toString() { + return "Subtype(" + subtype + ')'; + } + } + private final SubTypeSet subTypeSet; + private final String description; + private final boolean customSet; + private final SubTypePredicate predicate; SubType(String description, SubTypeSet subTypeSet) { this(description, subTypeSet, false); @@ -449,21 +475,22 @@ public enum SubType { this.description = description; this.subTypeSet = subTypeSet; this.customSet = customSet; + this.predicate = new SubTypePredicate(this); } public String getDescription() { return description; } - private final String description; - - private final boolean customSet; - @Override public String toString() { return description; } + public SubTypePredicate getPredicate() { + return predicate; + } + public static SubType fromString(String value) { for (SubType st : SubType.values()) { if (st.toString().equals(value)) { diff --git a/Mage/src/main/java/mage/filter/FilterPermanent.java b/Mage/src/main/java/mage/filter/FilterPermanent.java index e5cf7537ab..e88c924be9 100644 --- a/Mage/src/main/java/mage/filter/FilterPermanent.java +++ b/Mage/src/main/java/mage/filter/FilterPermanent.java @@ -10,7 +10,6 @@ import mage.filter.predicate.ObjectPlayer; import mage.filter.predicate.ObjectPlayerPredicate; import mage.filter.predicate.ObjectSourcePlayer; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -32,13 +31,13 @@ public class FilterPermanent extends FilterObject implements FilterIn public FilterPermanent(SubType subtype, String name) { super(name); - this.add(new SubtypePredicate(subtype)); + this.add(subtype.getPredicate()); } public FilterPermanent(Set subtypesList, String name) { super(name); for (SubType subtype : subtypesList) { - this.add(new SubtypePredicate(subtype)); + this.add(subtype.getPredicate()); } } diff --git a/Mage/src/main/java/mage/filter/StaticFilters.java b/Mage/src/main/java/mage/filter/StaticFilters.java index d1ec71d603..b1c049cb78 100644 --- a/Mage/src/main/java/mage/filter/StaticFilters.java +++ b/Mage/src/main/java/mage/filter/StaticFilters.java @@ -12,7 +12,6 @@ import mage.constants.TargetController; import mage.filter.common.*; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.MulticoloredPredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.filter.predicate.other.PlayerPredicate; import mage.filter.predicate.permanent.AnotherPredicate; @@ -595,7 +594,7 @@ public final class StaticFilters { static { FILTER_PERMANENT_AURA.add(CardType.ENCHANTMENT.getPredicate()); - FILTER_PERMANENT_AURA.add(new SubtypePredicate(SubType.AURA)); + FILTER_PERMANENT_AURA.add(SubType.AURA.getPredicate()); FILTER_PERMANENT_AURA.setLockedFilter(true); } @@ -603,7 +602,7 @@ public final class StaticFilters { static { FILTER_PERMANENT_EQUIPMENT.add(CardType.ARTIFACT.getPredicate()); - FILTER_PERMANENT_EQUIPMENT.add(new SubtypePredicate(SubType.EQUIPMENT)); + FILTER_PERMANENT_EQUIPMENT.add(SubType.EQUIPMENT.getPredicate()); FILTER_PERMANENT_EQUIPMENT.setLockedFilter(true); } @@ -611,7 +610,7 @@ public final class StaticFilters { static { FILTER_PERMANENT_FORTIFICATION.add(CardType.ARTIFACT.getPredicate()); - FILTER_PERMANENT_FORTIFICATION.add(new SubtypePredicate(SubType.FORTIFICATION)); + FILTER_PERMANENT_FORTIFICATION.add(SubType.FORTIFICATION.getPredicate()); FILTER_PERMANENT_FORTIFICATION.setLockedFilter(true); } diff --git a/Mage/src/main/java/mage/filter/common/FilterBySubtypeCard.java b/Mage/src/main/java/mage/filter/common/FilterBySubtypeCard.java index d5d52921c0..8d40cf6d8b 100644 --- a/Mage/src/main/java/mage/filter/common/FilterBySubtypeCard.java +++ b/Mage/src/main/java/mage/filter/common/FilterBySubtypeCard.java @@ -4,7 +4,6 @@ package mage.filter.common; import mage.constants.SubType; import mage.filter.FilterCard; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -15,7 +14,7 @@ public class FilterBySubtypeCard extends FilterCard { public FilterBySubtypeCard(SubType subtype) { super(subtype + " card"); - this.add(new SubtypePredicate(subtype)); + this.add(subtype.getPredicate()); } public FilterBySubtypeCard(final FilterBySubtypeCard filter) { diff --git a/Mage/src/main/java/mage/filter/common/FilterControlledCreaturePermanent.java b/Mage/src/main/java/mage/filter/common/FilterControlledCreaturePermanent.java index df2abdfb34..2a38a015a8 100644 --- a/Mage/src/main/java/mage/filter/common/FilterControlledCreaturePermanent.java +++ b/Mage/src/main/java/mage/filter/common/FilterControlledCreaturePermanent.java @@ -4,8 +4,6 @@ package mage.filter.common; import mage.constants.CardType; import mage.constants.SubType; -import mage.filter.predicate.mageobject.SubtypePredicate; - /** * * @author BetaSteward_at_googlemail.com @@ -29,7 +27,7 @@ public class FilterControlledCreaturePermanent extends FilterControlledPermanent this.add(CardType.CREATURE.getPredicate()); if(subtype != null) { - this.add(new SubtypePredicate(subtype)); + this.add(subtype.getPredicate()); } } diff --git a/Mage/src/main/java/mage/filter/common/FilterControlledPermanent.java b/Mage/src/main/java/mage/filter/common/FilterControlledPermanent.java index f2c2fdbf1b..5377dc32a6 100644 --- a/Mage/src/main/java/mage/filter/common/FilterControlledPermanent.java +++ b/Mage/src/main/java/mage/filter/common/FilterControlledPermanent.java @@ -3,7 +3,6 @@ package mage.filter.common; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; /** @@ -27,7 +26,7 @@ public class FilterControlledPermanent extends FilterPermanent { super(name); this.add(new ControllerPredicate(TargetController.YOU)); if (subtype != null) { - this.add(new SubtypePredicate(subtype)); + this.add(subtype.getPredicate()); } } diff --git a/Mage/src/main/java/mage/filter/common/FilterControlledPlaneswalkerPermanent.java b/Mage/src/main/java/mage/filter/common/FilterControlledPlaneswalkerPermanent.java index d115bdda66..bbbff0a270 100644 --- a/Mage/src/main/java/mage/filter/common/FilterControlledPlaneswalkerPermanent.java +++ b/Mage/src/main/java/mage/filter/common/FilterControlledPlaneswalkerPermanent.java @@ -2,7 +2,6 @@ package mage.filter.common; import mage.constants.CardType; import mage.constants.SubType; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @author LevelX2 @@ -20,7 +19,7 @@ public class FilterControlledPlaneswalkerPermanent extends FilterControlledPerma public FilterControlledPlaneswalkerPermanent(SubType subType, String name) { super(name); this.add(CardType.PLANESWALKER.getPredicate()); - this.add(new SubtypePredicate(subType)); + this.add(subType.getPredicate()); } public FilterControlledPlaneswalkerPermanent(String name) { diff --git a/Mage/src/main/java/mage/filter/common/FilterCreaturePermanent.java b/Mage/src/main/java/mage/filter/common/FilterCreaturePermanent.java index f00b74d50d..3f74f7da50 100644 --- a/Mage/src/main/java/mage/filter/common/FilterCreaturePermanent.java +++ b/Mage/src/main/java/mage/filter/common/FilterCreaturePermanent.java @@ -5,7 +5,6 @@ package mage.filter.common; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -25,7 +24,7 @@ public class FilterCreaturePermanent extends FilterPermanent { public FilterCreaturePermanent(SubType subtype, String name) { super(name); this.add(CardType.CREATURE.getPredicate()); - this.add(new SubtypePredicate(subtype)); + this.add(subtype.getPredicate()); } public FilterCreaturePermanent(final FilterCreaturePermanent filter) { diff --git a/Mage/src/main/java/mage/filter/common/FilterEquipmentPermanent.java b/Mage/src/main/java/mage/filter/common/FilterEquipmentPermanent.java index e2706b2a24..34d729d289 100644 --- a/Mage/src/main/java/mage/filter/common/FilterEquipmentPermanent.java +++ b/Mage/src/main/java/mage/filter/common/FilterEquipmentPermanent.java @@ -4,7 +4,6 @@ package mage.filter.common; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -18,7 +17,7 @@ public class FilterEquipmentPermanent extends FilterPermanent { public FilterEquipmentPermanent(String name) { super(name); - this.add(new SubtypePredicate(SubType.EQUIPMENT)); + this.add(SubType.EQUIPMENT.getPredicate()); } public FilterEquipmentPermanent(final FilterEquipmentPermanent filter) { diff --git a/Mage/src/main/java/mage/filter/common/FilterLandPermanent.java b/Mage/src/main/java/mage/filter/common/FilterLandPermanent.java index 57b190fbda..62bb9ec4e6 100644 --- a/Mage/src/main/java/mage/filter/common/FilterLandPermanent.java +++ b/Mage/src/main/java/mage/filter/common/FilterLandPermanent.java @@ -7,7 +7,6 @@ import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; /** @@ -27,7 +26,7 @@ public class FilterLandPermanent extends FilterPermanent { public FilterLandPermanent(SubType subtype, String name) { super(name); this.add(CardType.LAND.getPredicate()); - this.add(new SubtypePredicate(subtype)); + this.add(subtype.getPredicate()); } public static FilterLandPermanent nonbasicLand() { diff --git a/Mage/src/main/java/mage/filter/common/FilterOtherCreatureSharingCreatureSubtype.java b/Mage/src/main/java/mage/filter/common/FilterOtherCreatureSharingCreatureSubtype.java index 2fc7fe5de4..8a0443d767 100644 --- a/Mage/src/main/java/mage/filter/common/FilterOtherCreatureSharingCreatureSubtype.java +++ b/Mage/src/main/java/mage/filter/common/FilterOtherCreatureSharingCreatureSubtype.java @@ -7,7 +7,6 @@ import java.util.List; import mage.constants.SubType; import mage.constants.SubTypeSet; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.PermanentIdPredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -22,10 +21,10 @@ public class FilterOtherCreatureSharingCreatureSubtype extends FilterCreaturePer public FilterOtherCreatureSharingCreatureSubtype(Permanent creature, Game game) { super("creature sharing a creature type with " + creature.toString()); - List subtypePredicates = new ArrayList<>(); + List subtypePredicates = new ArrayList<>(); for (SubType subtype : creature.getSubtype(game)) { if (subtype.getSubTypeSet() == SubTypeSet.CreatureType) { - subtypePredicates.add(new SubtypePredicate(subtype)); + subtypePredicates.add(subtype.getPredicate()); } } this.add(Predicates.and( diff --git a/Mage/src/main/java/mage/filter/common/FilterPlaneswalkerPermanent.java b/Mage/src/main/java/mage/filter/common/FilterPlaneswalkerPermanent.java index 099b9dbf0c..875b6ff679 100644 --- a/Mage/src/main/java/mage/filter/common/FilterPlaneswalkerPermanent.java +++ b/Mage/src/main/java/mage/filter/common/FilterPlaneswalkerPermanent.java @@ -5,7 +5,6 @@ package mage.filter.common; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @author BetaSteward_at_googlemail.com @@ -18,7 +17,7 @@ public class FilterPlaneswalkerPermanent extends FilterPermanent { public FilterPlaneswalkerPermanent(SubType subType) { this(subType.getDescription() + " planeswalker"); - this.add(new SubtypePredicate(subType)); + this.add(subType.getPredicate()); } public FilterPlaneswalkerPermanent(String name) { diff --git a/Mage/src/main/java/mage/filter/common/FilterSpiritOrArcaneCard.java b/Mage/src/main/java/mage/filter/common/FilterSpiritOrArcaneCard.java index 384b01ee6c..c07d8b416b 100644 --- a/Mage/src/main/java/mage/filter/common/FilterSpiritOrArcaneCard.java +++ b/Mage/src/main/java/mage/filter/common/FilterSpiritOrArcaneCard.java @@ -3,7 +3,6 @@ package mage.filter.common; import mage.constants.SubType; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; public class FilterSpiritOrArcaneCard extends FilterSpell { @@ -13,7 +12,7 @@ public class FilterSpiritOrArcaneCard extends FilterSpell { public FilterSpiritOrArcaneCard(String name) { super(name); - this.add(Predicates.or(new SubtypePredicate(SubType.SPIRIT),new SubtypePredicate(SubType.ARCANE))); + this.add(Predicates.or(SubType.SPIRIT.getPredicate(),SubType.ARCANE.getPredicate())); } public FilterSpiritOrArcaneCard(final FilterSpiritOrArcaneCard filter) { diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/SubtypePredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/SubtypePredicate.java deleted file mode 100644 index 070c10e87e..0000000000 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/SubtypePredicate.java +++ /dev/null @@ -1,31 +0,0 @@ - -package mage.filter.predicate.mageobject; - -import mage.MageObject; -import mage.constants.SubType; -import mage.filter.predicate.Predicate; -import mage.game.Game; - -/** - * - * @author North - */ -public class SubtypePredicate implements Predicate { - - private final SubType subtype; - - public SubtypePredicate(SubType subtype) { - this.subtype = subtype; - } - - - @Override - public boolean apply(MageObject input, Game game) { - return input.hasSubtype(subtype, game); - } - - @Override - public String toString() { - return "Subtype(" + subtype + ')'; - } -} diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/ControllerControlsIslandPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/ControllerControlsIslandPredicate.java index c0e27b569f..ab9f182c04 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/ControllerControlsIslandPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/ControllerControlsIslandPredicate.java @@ -4,7 +4,6 @@ package mage.filter.predicate.permanent; import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; @@ -17,7 +16,7 @@ public class ControllerControlsIslandPredicate implements Predicate { public static final FilterLandPermanent filter = new FilterLandPermanent("Island"); static { - filter.add(new SubtypePredicate(SubType.ISLAND)); + filter.add(SubType.ISLAND.getPredicate()); } @Override diff --git a/Mage/src/main/java/mage/game/combat/Combat.java b/Mage/src/main/java/mage/game/combat/Combat.java index 91874cdd0d..b136dea269 100644 --- a/Mage/src/main/java/mage/game/combat/Combat.java +++ b/Mage/src/main/java/mage/game/combat/Combat.java @@ -18,7 +18,6 @@ import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.filter.predicate.mageobject.NamePredicate; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.filter.predicate.permanent.AttackingSameNotBandedPredicate; import mage.filter.predicate.permanent.PermanentIdPredicate; @@ -323,7 +322,7 @@ public class Combat implements Serializable, Copyable { for (Ability ab : bandsWithOther) { BandsWithOtherAbility ability = (BandsWithOtherAbility) ab; if (ability.getSubtype() != null) { - predicates.add(new SubtypePredicate(ability.getSubtype())); + predicates.add(ability.getSubtype().getPredicate()); } if (ability.getSupertype() != null) { predicates.add(new SupertypePredicate(ability.getSupertype())); @@ -357,7 +356,7 @@ public class Combat implements Serializable, Copyable { for (Ability ab : bandsWithOther) { BandsWithOtherAbility ability = (BandsWithOtherAbility) ab; if (ability.getSubtype() != null) { - predicates.add(new SubtypePredicate(ability.getSubtype())); + predicates.add(ability.getSubtype().getPredicate()); } if (ability.getSupertype() != null) { predicates.add(new SupertypePredicate(ability.getSupertype())); diff --git a/Mage/src/main/java/mage/game/command/emblems/GideonOfTheTrialsEmblem.java b/Mage/src/main/java/mage/game/command/emblems/GideonOfTheTrialsEmblem.java index b9b2cd4683..700ba7591e 100644 --- a/Mage/src/main/java/mage/game/command/emblems/GideonOfTheTrialsEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/GideonOfTheTrialsEmblem.java @@ -8,7 +8,6 @@ import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPlaneswalkerPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.command.Emblem; import mage.game.events.GameEvent; @@ -30,7 +29,7 @@ class GideonOfTheTrialsCantLoseEffect extends ContinuousRuleModifyingEffectImpl private static final FilterPlaneswalkerPermanent filter = new FilterPlaneswalkerPermanent("a Gideon planeswalker"); static { - filter.add(new SubtypePredicate(SubType.GIDEON)); + filter.add(SubType.GIDEON.getPredicate()); } public GideonOfTheTrialsCantLoseEffect() { diff --git a/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java b/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java index e11abefd72..a020c77937 100644 --- a/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java @@ -9,10 +9,7 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.DamageTargetEffect; import mage.constants.*; -import static mage.constants.Layer.AbilityAddingRemovingEffects_6; - import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.command.Emblem; @@ -37,7 +34,7 @@ class KothOfTheHammerThirdEffect extends ContinuousEffectImpl { static final FilterLandPermanent mountains = new FilterLandPermanent("Mountain you control"); static { - mountains.add(new SubtypePredicate(SubType.MOUNTAIN)); + mountains.add(SubType.MOUNTAIN.getPredicate()); mountains.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage/src/main/java/mage/game/command/emblems/LilianaOfTheDarkRealmsEmblem.java b/Mage/src/main/java/mage/game/command/emblems/LilianaOfTheDarkRealmsEmblem.java index 5acaa3281e..80af8ed325 100644 --- a/Mage/src/main/java/mage/game/command/emblems/LilianaOfTheDarkRealmsEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/LilianaOfTheDarkRealmsEmblem.java @@ -11,7 +11,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.command.Emblem; /** @@ -23,7 +22,7 @@ public final class LilianaOfTheDarkRealmsEmblem extends Emblem { private static final FilterLandPermanent filter = new FilterLandPermanent("Swamps"); static { - filter.add(new SubtypePredicate(SubType.SWAMP)); + filter.add(SubType.SWAMP.getPredicate()); } public LilianaOfTheDarkRealmsEmblem() { diff --git a/Mage/src/main/java/mage/game/command/emblems/LilianaTheLastHopeEmblem.java b/Mage/src/main/java/mage/game/command/emblems/LilianaTheLastHopeEmblem.java index 4c867957ff..dfe52769ef 100644 --- a/Mage/src/main/java/mage/game/command/emblems/LilianaTheLastHopeEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/LilianaTheLastHopeEmblem.java @@ -10,7 +10,6 @@ import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.command.Emblem; import mage.game.permanent.token.ZombieToken; @@ -35,7 +34,7 @@ class LilianaZombiesCount implements DynamicValue { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); static { - filter.add(new SubtypePredicate(SubType.ZOMBIE)); + filter.add(SubType.ZOMBIE.getPredicate()); } @Override diff --git a/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java index aa9ca68498..de4d9be1e2 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java @@ -10,7 +10,6 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -21,7 +20,7 @@ public final class KalonianTwingroveTreefolkWarriorToken extends TokenImpl { static final FilterControlledPermanent filterLands = new FilterControlledPermanent("Forests you control"); static { - filterLands.add(new SubtypePredicate(SubType.FOREST)); + filterLands.add(SubType.FOREST.getPredicate()); } public KalonianTwingroveTreefolkWarriorToken() { diff --git a/Mage/src/main/java/mage/game/turn/PreCombatMainStep.java b/Mage/src/main/java/mage/game/turn/PreCombatMainStep.java index a3614fe048..9806e61d9d 100644 --- a/Mage/src/main/java/mage/game/turn/PreCombatMainStep.java +++ b/Mage/src/main/java/mage/game/turn/PreCombatMainStep.java @@ -6,7 +6,6 @@ import mage.constants.PhaseStep; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.FilterPermanent; -import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; @@ -20,7 +19,7 @@ public class PreCombatMainStep extends Step { private static final FilterPermanent filter = new FilterPermanent("Saga"); static { - filter.add(new SubtypePredicate(SubType.SAGA)); + filter.add(SubType.SAGA.getPredicate()); } public PreCombatMainStep() {