diff --git a/Mage.Sets/src/mage/cards/b/BalaGedThief.java b/Mage.Sets/src/mage/cards/b/BalaGedThief.java index 41683254522..6056af48f28 100644 --- a/Mage.Sets/src/mage/cards/b/BalaGedThief.java +++ b/Mage.Sets/src/mage/cards/b/BalaGedThief.java @@ -34,6 +34,7 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; @@ -104,7 +105,7 @@ class BalaGedThiefEffect extends OneShotEffect { Player you = game.getPlayer(source.getControllerId()); FilterControlledPermanent filter = new FilterControlledPermanent(); - filter.add(new SubtypePredicate("Ally")); + filter.add(new SubtypePredicate(SubType.ALLY)); int numberOfAllies = game.getBattlefield().countAll(filter, you.getId(), game); diff --git a/Mage.Sets/src/mage/cards/b/BalefulStare.java b/Mage.Sets/src/mage/cards/b/BalefulStare.java index a74ce3ceb72..20350ea0eaf 100644 --- a/Mage.Sets/src/mage/cards/b/BalefulStare.java +++ b/Mage.Sets/src/mage/cards/b/BalefulStare.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; @@ -77,7 +78,7 @@ class BalefulStareEffect extends OneShotEffect { private static final FilterCard filter = new FilterCard("Mountain or red card"); static { - filter.add(Predicates.or(new SubtypePredicate("Mountain"), + filter.add(Predicates.or(new SubtypePredicate(SubType.MOUNTAIN), new ColorPredicate(ObjectColor.RED))); } diff --git a/Mage.Sets/src/mage/cards/b/BasalSliver.java b/Mage.Sets/src/mage/cards/b/BasalSliver.java index b074ccf76c4..50be806e092 100644 --- a/Mage.Sets/src/mage/cards/b/BasalSliver.java +++ b/Mage.Sets/src/mage/cards/b/BasalSliver.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -53,7 +54,7 @@ public class BasalSliver extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("All Slivers"); static { - filter.add(new SubtypePredicate("Sliver")); + filter.add(new SubtypePredicate(SubType.SLIVER)); } public BasalSliver(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 d60a5a1a9de..8c3e27fae16 100644 --- a/Mage.Sets/src/mage/cards/b/BatteringSliver.java +++ b/Mage.Sets/src/mage/cards/b/BatteringSliver.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -50,7 +51,7 @@ public class BatteringSliver extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("all Sliver creatures"); static { - filter.add(new SubtypePredicate("Sliver")); + filter.add(new SubtypePredicate(SubType.SLIVER)); } public BatteringSliver(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 c64455a2a2c..15b818d59ad 100644 --- a/Mage.Sets/src/mage/cards/b/BattlewandOak.java +++ b/Mage.Sets/src/mage/cards/b/BattlewandOak.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -50,8 +51,8 @@ public 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("Forest")); - filterTreefolk.add(new SubtypePredicate("Treefolk")); + filterForest.add(new SubtypePredicate(SubType.FOREST)); + filterTreefolk.add(new SubtypePredicate(SubType.TREEFOLK)); } 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 8b990c11b15..c1ab604d18f 100644 --- a/Mage.Sets/src/mage/cards/b/BeaconOfCreation.java +++ b/Mage.Sets/src/mage/cards/b/BeaconOfCreation.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.ShuffleSpellEffect; import mage.cards.CardImpl; 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; @@ -48,7 +49,7 @@ public class BeaconOfCreation extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Forest you control"); static { - filter.add(new SubtypePredicate("Forest")); + filter.add(new SubtypePredicate(SubType.FOREST)); } 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 501b4695761..d28c363f41c 100644 --- a/Mage.Sets/src/mage/cards/b/BelligerentSliver.java +++ b/Mage.Sets/src/mage/cards/b/BelligerentSliver.java @@ -34,10 +34,7 @@ import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.keyword.MenaceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -54,7 +51,7 @@ public class BelligerentSliver extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate("Sliver")); + filter.add(new SubtypePredicate(SubType.SLIVER)); } public BelligerentSliver(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 58aefd6e530..965d04e390f 100644 --- a/Mage.Sets/src/mage/cards/b/BenBenAkkiHermit.java +++ b/Mage.Sets/src/mage/cards/b/BenBenAkkiHermit.java @@ -37,6 +37,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; @@ -57,7 +58,7 @@ public class BenBenAkkiHermit extends CardImpl { static { filter.add(Predicates.not(new TappedPredicate())); - filter.add(new SubtypePredicate("Mountain")); + filter.add(new SubtypePredicate(SubType.MOUNTAIN)); } public BenBenAkkiHermit (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 e74017fe5f1..0533803c64f 100644 --- a/Mage.Sets/src/mage/cards/b/Benthicore.java +++ b/Mage.Sets/src/mage/cards/b/Benthicore.java @@ -40,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; 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.Predicates; @@ -60,7 +61,7 @@ public class Benthicore extends CardImpl { static { filter.add(Predicates.not(new TappedPredicate())); - filter.add(new SubtypePredicate("Merfolk")); + filter.add(new SubtypePredicate(SubType.MERFOLK)); } 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 5d7007ae5b0..c0df8657283 100644 --- a/Mage.Sets/src/mage/cards/b/BerserkMurlodont.java +++ b/Mage.Sets/src/mage/cards/b/BerserkMurlodont.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -50,7 +51,7 @@ public class BerserkMurlodont extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a Beast"); static { - filter.add(new SubtypePredicate("Beast")); + filter.add(new SubtypePredicate(SubType.BEAST)); } public BerserkMurlodont(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 0022e28fa22..e4e11e9245d 100644 --- a/Mage.Sets/src/mage/cards/b/BlasterMage.java +++ b/Mage.Sets/src/mage/cards/b/BlasterMage.java @@ -37,6 +37,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -53,7 +54,7 @@ public class BlasterMage extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Wall"); static { - filter.add(new SubtypePredicate("Wall")); + filter.add(new SubtypePredicate(SubType.WALL)); } public BlasterMage(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 be504b13a7d..81b7f0a51fb 100644 --- a/Mage.Sets/src/mage/cards/b/BloodChinFanatic.java +++ b/Mage.Sets/src/mage/cards/b/BloodChinFanatic.java @@ -39,6 +39,7 @@ import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -58,7 +59,7 @@ public class BloodChinFanatic extends CardImpl { static { filter.add(new AnotherPredicate()); - filter.add(new SubtypePredicate("Warrior")); + filter.add(new SubtypePredicate(SubType.WARRIOR)); } 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 57bc50da82b..9b422b6976a 100644 --- a/Mage.Sets/src/mage/cards/b/BloodSpeaker.java +++ b/Mage.Sets/src/mage/cards/b/BloodSpeaker.java @@ -38,6 +38,7 @@ import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.FilterCard; @@ -56,8 +57,8 @@ public class BloodSpeaker extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a Demon under your control"); private static final FilterCard filterCard = new FilterCard("Demon card"); static { - filter.add(new SubtypePredicate("Demon")); - filterCard.add(new SubtypePredicate("Demon")); + filter.add(new SubtypePredicate(SubType.DEMON)); + filterCard.add(new SubtypePredicate(SubType.DEMON)); } public BloodSpeaker (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BloodTribute.java b/Mage.Sets/src/mage/cards/b/BloodTribute.java index f6130c8cfe5..87992db02a6 100644 --- a/Mage.Sets/src/mage/cards/b/BloodTribute.java +++ b/Mage.Sets/src/mage/cards/b/BloodTribute.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -59,7 +60,7 @@ public class BloodTribute extends CardImpl { static { filter.add(Predicates.not(new TappedPredicate())); - filter.add(new SubtypePredicate("Vampire")); + filter.add(new SubtypePredicate(SubType.VAMPIRE)); } public BloodTribute(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 07eaf6f5e6d..c318edff8f8 100644 --- a/Mage.Sets/src/mage/cards/b/BludgeonBrawl.java +++ b/Mage.Sets/src/mage/cards/b/BludgeonBrawl.java @@ -108,7 +108,7 @@ class BludgeonBrawlAddSubtypeEffect extends ContinuousEffectImpl { public boolean apply(Game game, Ability source) { FilterArtifactPermanent filter = new FilterArtifactPermanent("noncreature, non-Equipment artifact"); filter.add(Predicates.not(new CardTypePredicate(CardType.CREATURE))); - filter.add(Predicates.not(new SubtypePredicate("Equipment"))); + filter.add(Predicates.not(new SubtypePredicate(SubType.EQUIPMENT))); Cards affectedPermanents = new CardsImpl(); List permanents = game.getBattlefield().getActivePermanents(filter, source.getControllerId(), game); diff --git a/Mage.Sets/src/mage/cards/b/BogStriderAsh.java b/Mage.Sets/src/mage/cards/b/BogStriderAsh.java index 10df9f84751..e05ecfeb830 100644 --- a/Mage.Sets/src/mage/cards/b/BogStriderAsh.java +++ b/Mage.Sets/src/mage/cards/b/BogStriderAsh.java @@ -36,6 +36,7 @@ import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -50,7 +51,7 @@ public class BogStriderAsh extends CardImpl { private static final FilterSpell filter = new FilterSpell("a Goblin spell"); static { - filter.add(new SubtypePredicate("Goblin")); + filter.add(new SubtypePredicate(SubType.GOBLIN)); } public BogStriderAsh(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 7762e53fb32..bd2163c83f9 100644 --- a/Mage.Sets/src/mage/cards/b/Boneknitter.java +++ b/Mage.Sets/src/mage/cards/b/Boneknitter.java @@ -36,6 +36,7 @@ import mage.abilities.keyword.MorphAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -52,7 +53,7 @@ public class Boneknitter extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Zombie"); static { - filter.add(new SubtypePredicate("Zombie")); + filter.add(new SubtypePredicate(SubType.ZOMBIE)); } public Boneknitter(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BoskBanneret.java b/Mage.Sets/src/mage/cards/b/BoskBanneret.java index ac42feadd1c..6b44f72de5f 100644 --- a/Mage.Sets/src/mage/cards/b/BoskBanneret.java +++ b/Mage.Sets/src/mage/cards/b/BoskBanneret.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; @@ -50,8 +51,8 @@ public class BoskBanneret extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate("Treefolk"), - new SubtypePredicate("Shaman"))); + new SubtypePredicate(SubType.TREEFOLK), + new SubtypePredicate(SubType.SHAMAN))); } public BoskBanneret(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 9372e0db319..6e3146a3171 100644 --- a/Mage.Sets/src/mage/cards/b/Brawn.java +++ b/Mage.Sets/src/mage/cards/b/Brawn.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; @@ -58,7 +59,7 @@ public class Brawn extends CardImpl { static { filter.add(new CardTypePredicate(CardType.LAND)); - filter.add(new SubtypePredicate("Forest")); + filter.add(new SubtypePredicate(SubType.FOREST)); } 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 6721f69e8ce..185359313a9 100644 --- a/Mage.Sets/src/mage/cards/b/BrighthearthBanneret.java +++ b/Mage.Sets/src/mage/cards/b/BrighthearthBanneret.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.ReinforceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; @@ -52,8 +53,8 @@ public class BrighthearthBanneret extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate("Elemental"), - new SubtypePredicate("Warrior"))); + new SubtypePredicate(SubType.ELEMENTAL), + new SubtypePredicate(SubType.WARRIOR))); } 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 78e631c0b42..b75ca66afe0 100644 --- a/Mage.Sets/src/mage/cards/b/BrightstoneRitual.java +++ b/Mage.Sets/src/mage/cards/b/BrightstoneRitual.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.DynamicManaEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -47,7 +48,7 @@ public class BrightstoneRitual extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Goblin on the battlefield"); static { - filter.add(new SubtypePredicate("Goblin")); + filter.add(new SubtypePredicate(SubType.GOBLIN)); } 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 db7825d2983..b44d5b9b360 100644 --- a/Mage.Sets/src/mage/cards/b/BroodBirthing.java +++ b/Mage.Sets/src/mage/cards/b/BroodBirthing.java @@ -33,6 +33,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; 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; @@ -82,8 +83,8 @@ class BroodBirthingEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Eldrazi Spawn"); - filter.add(new SubtypePredicate("Eldrazi")); - filter.add(new SubtypePredicate("Spawn")); + filter.add(new SubtypePredicate(SubType.ELDRAZI)); + filter.add(new SubtypePredicate(SubType.SPAWN)); 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/BrunaLightOfAlabaster.java b/Mage.Sets/src/mage/cards/b/BrunaLightOfAlabaster.java index a6294d520f8..65ad99bc44f 100644 --- a/Mage.Sets/src/mage/cards/b/BrunaLightOfAlabaster.java +++ b/Mage.Sets/src/mage/cards/b/BrunaLightOfAlabaster.java @@ -109,7 +109,7 @@ class BrunaLightOfAlabasterEffect extends OneShotEffect { filterAura.add(new SubtypePredicate(SubType.AURA)); filterAura.add(new AuraPermanentCanAttachToPermanentId(bruna)); filterAuraCard.add(new CardTypePredicate(CardType.ENCHANTMENT)); - filterAuraCard.add(new SubtypePredicate("Aura")); + filterAuraCard.add(new SubtypePredicate(SubType.AURA)); filterAuraCard.add(new AuraCardCanAttachToPermanentId(bruna)); if (player == null) { diff --git a/Mage.Sets/src/mage/cards/c/CabalArchon.java b/Mage.Sets/src/mage/cards/c/CabalArchon.java index 19e15dc1976..117f2d5ddd1 100644 --- a/Mage.Sets/src/mage/cards/c/CabalArchon.java +++ b/Mage.Sets/src/mage/cards/c/CabalArchon.java @@ -38,6 +38,7 @@ import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -55,7 +56,7 @@ public class CabalArchon extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Cleric"); static { - filter.add(new SubtypePredicate("Cleric")); + filter.add(new SubtypePredicate(SubType.CLERIC)); } public CabalArchon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CateranKidnappers.java b/Mage.Sets/src/mage/cards/c/CateranKidnappers.java index ba7d15e9a0a..9e9ee918232 100644 --- a/Mage.Sets/src/mage/cards/c/CateranKidnappers.java +++ b/Mage.Sets/src/mage/cards/c/CateranKidnappers.java @@ -38,6 +38,7 @@ import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; @@ -54,7 +55,7 @@ public 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("Mercenary")); + filter.add(new SubtypePredicate(SubType.MERCENARY)); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); } diff --git a/Mage.Sets/src/mage/cards/c/CeaselessSearblades.java b/Mage.Sets/src/mage/cards/c/CeaselessSearblades.java index ff0ed860001..215c93986b6 100644 --- a/Mage.Sets/src/mage/cards/c/CeaselessSearblades.java +++ b/Mage.Sets/src/mage/cards/c/CeaselessSearblades.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -77,7 +78,7 @@ class CeaselessSearbladesTriggeredAbility extends TriggeredAbilityImpl { private static final FilterCard filter = new FilterCard("an Elemental"); static { - filter.add(new SubtypePredicate("Elemental")); + filter.add(new SubtypePredicate(SubType.ELEMENTAL)); } CeaselessSearbladesTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/c/ChampionOfTheParish.java b/Mage.Sets/src/mage/cards/c/ChampionOfTheParish.java index 1e2de5f8592..c7e6f331531 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionOfTheParish.java +++ b/Mage.Sets/src/mage/cards/c/ChampionOfTheParish.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; @@ -49,7 +50,7 @@ public class ChampionOfTheParish extends CardImpl { private static final FilterPermanent filter = new FilterControlledCreaturePermanent("another Human"); static { - filter.add(new SubtypePredicate("Human")); + filter.add(new SubtypePredicate(SubType.HUMAN)); filter.add(new AnotherPredicate()); } diff --git a/Mage.Sets/src/mage/cards/c/ChaosCharm.java b/Mage.Sets/src/mage/cards/c/ChaosCharm.java index cd549d2e8a2..25870a82392 100644 --- a/Mage.Sets/src/mage/cards/c/ChaosCharm.java +++ b/Mage.Sets/src/mage/cards/c/ChaosCharm.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; 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; @@ -52,7 +53,7 @@ public class ChaosCharm extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Wall"); static { - filter.add(new SubtypePredicate("Wall")); + filter.add(new SubtypePredicate(SubType.WALL)); } public ChaosCharm(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ChiefChirpa.java b/Mage.Sets/src/mage/cards/c/ChiefChirpa.java index 7c037cd4fb4..06a5b93cb49 100644 --- a/Mage.Sets/src/mage/cards/c/ChiefChirpa.java +++ b/Mage.Sets/src/mage/cards/c/ChiefChirpa.java @@ -38,6 +38,7 @@ import mage.abilities.keyword.MonstrosityAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; import mage.counters.CounterType; @@ -65,7 +66,7 @@ public class ChiefChirpa extends CardImpl { diedFilter.add(new ColorPredicate(ObjectColor.GREEN)); diedFilter.add(new ControllerPredicate(TargetController.YOU)); - ewokFilter.add(new SubtypePredicate("Ewok")); + ewokFilter.add(new SubtypePredicate(SubType.EWOK)); ewokFilter.add(new AnotherPredicate()); } diff --git a/Mage.Sets/src/mage/cards/c/ChiefOfTheScale.java b/Mage.Sets/src/mage/cards/c/ChiefOfTheScale.java index affcf3da0ad..80b4844d47c 100644 --- a/Mage.Sets/src/mage/cards/c/ChiefOfTheScale.java +++ b/Mage.Sets/src/mage/cards/c/ChiefOfTheScale.java @@ -34,6 +34,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -49,7 +50,7 @@ public class ChiefOfTheScale extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Warrior creatures"); static { - filter.add(new SubtypePredicate("Warrior")); + filter.add(new SubtypePredicate(SubType.WARRIOR)); } public ChiefOfTheScale(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 e89059e9d44..870727959d7 100644 --- a/Mage.Sets/src/mage/cards/c/ChokedEstuary.java +++ b/Mage.Sets/src/mage/cards/c/ChokedEstuary.java @@ -35,6 +35,7 @@ import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -51,8 +52,8 @@ public 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("Island"), - new SubtypePredicate("Swamp"))); + filter.add(Predicates.or(new SubtypePredicate(SubType.ISLAND), + new SubtypePredicate(SubType.SWAMP))); } public ChokedEstuary(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 83ed18010bf..728ec1e42d5 100644 --- a/Mage.Sets/src/mage/cards/c/ClifftopRetreat.java +++ b/Mage.Sets/src/mage/cards/c/ClifftopRetreat.java @@ -40,6 +40,7 @@ import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -54,7 +55,7 @@ public class ClifftopRetreat extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(Predicates.or(new SubtypePredicate("Mountain"), new SubtypePredicate("Plains"))); + filter.add(Predicates.or(new SubtypePredicate(SubType.MOUNTAIN), new SubtypePredicate(SubType.PLAINS))); } public ClifftopRetreat(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 b2d87fd0fd1..b9b79eb577e 100644 --- a/Mage.Sets/src/mage/cards/c/ClotSliver.java +++ b/Mage.Sets/src/mage/cards/c/ClotSliver.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -51,7 +52,7 @@ public class ClotSliver extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Slivers"); static { - filter.add(new SubtypePredicate("Sliver")); + filter.add(new SubtypePredicate(SubType.SLIVER)); } public ClotSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CoaxFromTheBlindEternities.java b/Mage.Sets/src/mage/cards/c/CoaxFromTheBlindEternities.java index b6bd03c3bd5..92be6392f8c 100644 --- a/Mage.Sets/src/mage/cards/c/CoaxFromTheBlindEternities.java +++ b/Mage.Sets/src/mage/cards/c/CoaxFromTheBlindEternities.java @@ -31,6 +31,7 @@ import mage.abilities.effects.common.WishEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -45,7 +46,7 @@ public class CoaxFromTheBlindEternities extends CardImpl { private static final FilterCard filter = new FilterCard("an Eldrazi card"); static { - filter.add(new SubtypePredicate("Eldrazi")); + filter.add(new SubtypePredicate(SubType.ELDRAZI)); } public CoaxFromTheBlindEternities(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CompanionOfTheTrials.java b/Mage.Sets/src/mage/cards/c/CompanionOfTheTrials.java index 34827a65a54..0cd1ecb678e 100644 --- a/Mage.Sets/src/mage/cards/c/CompanionOfTheTrials.java +++ b/Mage.Sets/src/mage/cards/c/CompanionOfTheTrials.java @@ -39,6 +39,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPlaneswalkerPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -52,7 +53,7 @@ public class CompanionOfTheTrials extends CardImpl { private static final FilterPlaneswalkerPermanent filter = new FilterPlaneswalkerPermanent("you control a Gideon planeswalker"); static { - filter.add(new SubtypePredicate("Gideon")); + filter.add(new SubtypePredicate(SubType.GIDEON)); } public CompanionOfTheTrials(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 e01a7a9450e..b88be3dc9e0 100644 --- a/Mage.Sets/src/mage/cards/c/CourageousOutrider.java +++ b/Mage.Sets/src/mage/cards/c/CourageousOutrider.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -48,7 +49,7 @@ public class CourageousOutrider extends CardImpl { private static final FilterCard filter = new FilterCard("a Human card"); static { - filter.add(new SubtypePredicate("Human")); + filter.add(new SubtypePredicate(SubType.HUMAN)); } public CourageousOutrider(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 d62d9d8d03a..e65dbb14db5 100644 --- a/Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java +++ b/Mage.Sets/src/mage/cards/c/CrimsonMuckwader.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.continuous.BoostSourceWhileControlsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -51,7 +52,7 @@ public class CrimsonMuckwader extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Swamp"); static { - filter.add(new SubtypePredicate("Swamp")); + filter.add(new SubtypePredicate(SubType.SWAMP)); } public CrimsonMuckwader(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 dc11058efe5..91d75800edd 100644 --- a/Mage.Sets/src/mage/cards/c/CrossroadsConsecrator.java +++ b/Mage.Sets/src/mage/cards/c/CrossroadsConsecrator.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterAttackingCreature; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -53,7 +54,7 @@ public class CrossroadsConsecrator extends CardImpl { private final static FilterAttackingCreature filter = new FilterAttackingCreature("attacking Human"); static { - filter.add(new SubtypePredicate("Human")); + filter.add(new SubtypePredicate(SubType.HUMAN)); } public CrossroadsConsecrator(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 97577a1234e..d25a5bac50e 100644 --- a/Mage.Sets/src/mage/cards/c/CrucibleOfFire.java +++ b/Mage.Sets/src/mage/cards/c/CrucibleOfFire.java @@ -31,10 +31,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -50,7 +47,7 @@ public class CrucibleOfFire extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Dragon creatures"); static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate("Dragon")); + filter.add(new SubtypePredicate(SubType.DRAGON)); } public CrucibleOfFire(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 0af2538e3e2..952df904921 100644 --- a/Mage.Sets/src/mage/cards/c/CryptGhast.java +++ b/Mage.Sets/src/mage/cards/c/CryptGhast.java @@ -36,6 +36,7 @@ import mage.abilities.mana.TriggeredManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -79,7 +80,7 @@ class CryptGhastTriggeredAbility extends TriggeredManaAbility { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("Swamp"); static { - filter.add(new SubtypePredicate("Swamp")); + filter.add(new SubtypePredicate(SubType.SWAMP)); } public CryptGhastTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/c/CurseOfMaritLage.java b/Mage.Sets/src/mage/cards/c/CurseOfMaritLage.java index 4f454d2ae88..ffb6b5373e1 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfMaritLage.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfMaritLage.java @@ -33,10 +33,7 @@ import mage.abilities.effects.common.DontUntapInControllersUntapStepAllEffect; import mage.abilities.effects.common.TapAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -51,7 +48,7 @@ public class CurseOfMaritLage extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Islands"); static { - filter.add(new SubtypePredicate("Island")); + filter.add(new SubtypePredicate(SubType.ISLAND)); } public CurseOfMaritLage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CutTheTethers.java b/Mage.Sets/src/mage/cards/c/CutTheTethers.java index 0c65bf84309..cea377a580d 100644 --- a/Mage.Sets/src/mage/cards/c/CutTheTethers.java +++ b/Mage.Sets/src/mage/cards/c/CutTheTethers.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -72,7 +73,7 @@ class CutTheTethersEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Spirit creatures"); static { - filter.add(new SubtypePredicate("Spirit")); + filter.add(new SubtypePredicate(SubType.SPIRIT)); } public CutTheTethersEffect() { diff --git a/Mage.Sets/src/mage/cards/d/DakmorSorceress.java b/Mage.Sets/src/mage/cards/d/DakmorSorceress.java index b3346cdec0a..df4b4f84313 100644 --- a/Mage.Sets/src/mage/cards/d/DakmorSorceress.java +++ b/Mage.Sets/src/mage/cards/d/DakmorSorceress.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; 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; @@ -50,7 +51,7 @@ public class DakmorSorceress extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Swamps you control"); static { - filter.add(new SubtypePredicate("Swamp")); + filter.add(new SubtypePredicate(SubType.SWAMP)); } public DakmorSorceress(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 742aa0ffad6..5b769ffbb10 100644 --- a/Mage.Sets/src/mage/cards/d/DarkHeartOfTheWood.java +++ b/Mage.Sets/src/mage/cards/d/DarkHeartOfTheWood.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -49,7 +50,7 @@ public class DarkHeartOfTheWood extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Forest"); static { - filter.add(new SubtypePredicate("Forest")); + filter.add(new SubtypePredicate(SubType.FOREST)); } 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 ebb1985a2cd..60d1ae0671e 100644 --- a/Mage.Sets/src/mage/cards/d/DarkIntimations.java +++ b/Mage.Sets/src/mage/cards/d/DarkIntimations.java @@ -68,7 +68,7 @@ public class DarkIntimations extends CardImpl { static { filter.add(new CardTypePredicate(CardType.PLANESWALKER)); - filter.add(new SubtypePredicate("Bolas")); + filter.add(new SubtypePredicate(SubType.BOLAS)); } 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 3ba3e70c5ac..fe69c6dd583 100644 --- a/Mage.Sets/src/mage/cards/d/DarkSalvation.java +++ b/Mage.Sets/src/mage/cards/d/DarkSalvation.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; 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.game.Game; @@ -86,7 +87,7 @@ class ZombiesControlledByTargetPlayerCount implements DynamicValue { private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Zombies"); static { - filter.add(new SubtypePredicate("Zombie")); + filter.add(new SubtypePredicate(SubType.ZOMBIE)); } @Override diff --git a/Mage.Sets/src/mage/cards/d/DaruWarchief.java b/Mage.Sets/src/mage/cards/d/DaruWarchief.java index cbe956df081..684f546c5a1 100644 --- a/Mage.Sets/src/mage/cards/d/DaruWarchief.java +++ b/Mage.Sets/src/mage/cards/d/DaruWarchief.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; @@ -52,8 +53,8 @@ public class DaruWarchief extends CardImpl { private static final FilterCreaturePermanent filterCreatures = new FilterCreaturePermanent("Soldier creatures"); static { - filter.add(new SubtypePredicate("Soldier")); - filterCreatures.add(new SubtypePredicate("Soldier")); + filter.add(new SubtypePredicate(SubType.SOLDIER)); + filterCreatures.add(new SubtypePredicate(SubType.SOLDIER)); } 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 3dbb264ecf1..738ba28815e 100644 --- a/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java +++ b/Mage.Sets/src/mage/cards/d/DauntlessDourbark.java @@ -40,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; 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.Predicates; @@ -59,9 +60,9 @@ public class DauntlessDourbark extends CardImpl { final static private FilterControlledPermanent filter2 = new FilterControlledPermanent(); static { - filter.add(Predicates.or(new SubtypePredicate("Forest"), - new SubtypePredicate("Treefolk"))); - filter2.add(new SubtypePredicate("Treefolk")); + filter.add(Predicates.or(new SubtypePredicate(SubType.FOREST), + new SubtypePredicate(SubType.TREEFOLK))); + filter2.add(new SubtypePredicate(SubType.TREEFOLK)); filter2.add(new AnotherPredicate()); } diff --git a/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java b/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java index 246dffa4f6c..a3c89c04c20 100644 --- a/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java +++ b/Mage.Sets/src/mage/cards/d/DauntlessRiverMarshal.java @@ -37,6 +37,7 @@ import mage.abilities.effects.common.continuous.BoostSourceWhileControlsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -53,7 +54,7 @@ public class DauntlessRiverMarshal extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("an Island"); static { - filter.add(new SubtypePredicate("Island")); + filter.add(new SubtypePredicate(SubType.ISLAND)); } diff --git a/Mage.Sets/src/mage/cards/d/DeathlessBehemoth.java b/Mage.Sets/src/mage/cards/d/DeathlessBehemoth.java index b438109abeb..cfcb493eee7 100644 --- a/Mage.Sets/src/mage/cards/d/DeathlessBehemoth.java +++ b/Mage.Sets/src/mage/cards/d/DeathlessBehemoth.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; @@ -53,8 +54,8 @@ public class DeathlessBehemoth extends CardImpl { static { filter.add(Predicates.and( - new SubtypePredicate("Eldrazi"), - new SubtypePredicate("Scion"))); + new SubtypePredicate(SubType.ELDRAZI), + new SubtypePredicate(SubType.SCION))); } public DeathlessBehemoth(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 fbce2c7d22d..e0f916a4347 100644 --- a/Mage.Sets/src/mage/cards/d/DeathsporeThallid.java +++ b/Mage.Sets/src/mage/cards/d/DeathsporeThallid.java @@ -38,10 +38,7 @@ import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -59,7 +56,7 @@ public class DeathsporeThallid extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Saproling"); static { - filter.add(new SubtypePredicate("Saproling")); + filter.add(new SubtypePredicate(SubType.SAPROLING)); } public DeathsporeThallid(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DementiaSliver.java b/Mage.Sets/src/mage/cards/d/DementiaSliver.java index b9ec9188937..70b1afb209e 100644 --- a/Mage.Sets/src/mage/cards/d/DementiaSliver.java +++ b/Mage.Sets/src/mage/cards/d/DementiaSliver.java @@ -38,10 +38,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.NameACardEffect; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.cards.*; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -59,7 +56,7 @@ public class DementiaSliver extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("All Slivers"); static { - filter.add(new SubtypePredicate("Sliver")); + filter.add(new SubtypePredicate(SubType.SLIVER)); } public DementiaSliver(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 73988462889..60b0e9291fc 100644 --- a/Mage.Sets/src/mage/cards/d/DevoutChaplain.java +++ b/Mage.Sets/src/mage/cards/d/DevoutChaplain.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.ExileTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.filter.common.FilterControlledPermanent; @@ -56,7 +57,7 @@ public class DevoutChaplain extends CardImpl { static { humanFilter.add(Predicates.not(new TappedPredicate())); - humanFilter.add(new SubtypePredicate("Human")); + humanFilter.add(new SubtypePredicate(SubType.HUMAN)); } public DevoutChaplain(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 b3be879e223..3c62b114103 100644 --- a/Mage.Sets/src/mage/cards/d/DiregrafCaptain.java +++ b/Mage.Sets/src/mage/cards/d/DiregrafCaptain.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -58,7 +59,7 @@ public class DiregrafCaptain extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Zombie"); static { - filter.add(new SubtypePredicate("Zombie")); + filter.add(new SubtypePredicate(SubType.ZOMBIE)); } public DiregrafCaptain(UUID ownerId, CardSetInfo setInfo) { @@ -91,7 +92,7 @@ class DiregrafCaptainTriggeredAbility extends TriggeredAbilityImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Zombie"); static { - filter.add(new SubtypePredicate("Zombie")); + filter.add(new SubtypePredicate(SubType.ZOMBIE)); } public DiregrafCaptainTriggeredAbility() { diff --git a/Mage.Sets/src/mage/cards/d/DiregrafColossus.java b/Mage.Sets/src/mage/cards/d/DiregrafColossus.java index 529c268e521..8c679bfd8fd 100644 --- a/Mage.Sets/src/mage/cards/d/DiregrafColossus.java +++ b/Mage.Sets/src/mage/cards/d/DiregrafColossus.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.FilterSpell; import mage.filter.common.FilterCreatureCard; @@ -57,7 +58,7 @@ public class DiregrafColossus extends CardImpl { private static final FilterSpell filter = new FilterSpell("a Zombie spell"); static { - filter.add(new SubtypePredicate("Zombie")); + filter.add(new SubtypePredicate(SubType.ZOMBIE)); } public DiregrafColossus(UUID ownerId, CardSetInfo setInfo) { @@ -90,7 +91,7 @@ class DiregrafColossusEffect extends OneShotEffect { private static final FilterCreatureCard filter = new FilterCreatureCard(); static { - filter.add(new SubtypePredicate("Zombie")); + filter.add(new SubtypePredicate(SubType.ZOMBIE)); } public DiregrafColossusEffect() { diff --git a/Mage.Sets/src/mage/cards/d/DiregrafEscort.java b/Mage.Sets/src/mage/cards/d/DiregrafEscort.java index f96d64e8635..33ada43c540 100644 --- a/Mage.Sets/src/mage/cards/d/DiregrafEscort.java +++ b/Mage.Sets/src/mage/cards/d/DiregrafEscort.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.SoulbondAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; @@ -52,7 +53,7 @@ public class DiregrafEscort extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("Zombies"); static { - filter.add(new SubtypePredicate("Zombie")); + filter.add(new SubtypePredicate(SubType.ZOMBIE)); } 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 2ca5f190d39..43dc9d1fa2e 100644 --- a/Mage.Sets/src/mage/cards/d/Disarm.java +++ b/Mage.Sets/src/mage/cards/d/Disarm.java @@ -33,6 +33,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; 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; @@ -91,7 +92,7 @@ public class Disarm extends CardImpl { FilterPermanent equipmentFilter = new FilterPermanent(); equipmentFilter.add(new AttachedToPredicate(creatureFilter)); - equipmentFilter.add(new SubtypePredicate("Equipment")); + equipmentFilter.add(new SubtypePredicate(SubType.EQUIPMENT)); for (Permanent equipment : game.getBattlefield().getAllActivePermanents(equipmentFilter, game)) { creature.removeAttachment(equipment.getId(), game); diff --git a/Mage.Sets/src/mage/cards/d/DocentOfPerfection.java b/Mage.Sets/src/mage/cards/d/DocentOfPerfection.java index db82b19019b..8bb84c4416b 100644 --- a/Mage.Sets/src/mage/cards/d/DocentOfPerfection.java +++ b/Mage.Sets/src/mage/cards/d/DocentOfPerfection.java @@ -41,6 +41,7 @@ import mage.cards.CardSetInfo; import mage.cards.f.FinalIteration; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.FilterSpell; @@ -105,7 +106,7 @@ class DocentOfPerfectionEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterPermanent("Wizards"); static { - filter.add(new SubtypePredicate("Wizard")); + filter.add(new SubtypePredicate(SubType.WIZARD)); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/d/DoubtlessOne.java b/Mage.Sets/src/mage/cards/d/DoubtlessOne.java index 1a87170deba..ae28c400356 100644 --- a/Mage.Sets/src/mage/cards/d/DoubtlessOne.java +++ b/Mage.Sets/src/mage/cards/d/DoubtlessOne.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -51,7 +52,7 @@ public class DoubtlessOne extends CardImpl { final static FilterPermanent filter = new FilterPermanent("Clerics on the battlefield"); static { - filter.add(new SubtypePredicate("Cleric")); + filter.add(new SubtypePredicate(SubType.CLERIC)); } public DoubtlessOne(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DragonloftIdol.java b/Mage.Sets/src/mage/cards/d/DragonloftIdol.java index 003ae075b61..5f770f487c3 100644 --- a/Mage.Sets/src/mage/cards/d/DragonloftIdol.java +++ b/Mage.Sets/src/mage/cards/d/DragonloftIdol.java @@ -39,10 +39,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -59,7 +56,7 @@ public class DragonloftIdol extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate("Dragon")); + filter.add(new SubtypePredicate(SubType.DRAGON)); } public DragonloftIdol(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 e16e247e816..1f6b6d014b1 100644 --- a/Mage.Sets/src/mage/cards/d/DragonskullSummit.java +++ b/Mage.Sets/src/mage/cards/d/DragonskullSummit.java @@ -40,6 +40,7 @@ import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -55,7 +56,7 @@ public class DragonskullSummit extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(Predicates.or(new SubtypePredicate("Swamp"), new SubtypePredicate("Mountain"))); + filter.add(Predicates.or(new SubtypePredicate(SubType.SWAMP), new SubtypePredicate(SubType.MOUNTAIN))); } public DragonskullSummit(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DrogskolCaptain.java b/Mage.Sets/src/mage/cards/d/DrogskolCaptain.java index 25d72826830..8b58dd74f71 100644 --- a/Mage.Sets/src/mage/cards/d/DrogskolCaptain.java +++ b/Mage.Sets/src/mage/cards/d/DrogskolCaptain.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -51,7 +52,7 @@ public class DrogskolCaptain extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Spirit"); static { - filter.add(new SubtypePredicate("Spirit")); + filter.add(new SubtypePredicate(SubType.SPIRIT)); } public DrogskolCaptain(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DromarsCavern.java b/Mage.Sets/src/mage/cards/d/DromarsCavern.java index d5bf6e1b99e..4a5d303ebcf 100644 --- a/Mage.Sets/src/mage/cards/d/DromarsCavern.java +++ b/Mage.Sets/src/mage/cards/d/DromarsCavern.java @@ -36,6 +36,7 @@ import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -51,7 +52,7 @@ public class DromarsCavern extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("non-Lair land"); static{ - filter.add(Predicates.not(new SubtypePredicate("Lair"))); + filter.add(Predicates.not(new SubtypePredicate(SubType.LAIR))); } public DromarsCavern(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); diff --git a/Mage.Sets/src/mage/cards/d/DrownedCatacomb.java b/Mage.Sets/src/mage/cards/d/DrownedCatacomb.java index cf79f7ecb86..57f301cd49f 100644 --- a/Mage.Sets/src/mage/cards/d/DrownedCatacomb.java +++ b/Mage.Sets/src/mage/cards/d/DrownedCatacomb.java @@ -40,6 +40,7 @@ import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -55,7 +56,7 @@ public class DrownedCatacomb extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(Predicates.or(new SubtypePredicate("Swamp"), new SubtypePredicate("Island"))); + filter.add(Predicates.or(new SubtypePredicate(SubType.SWAMP), new SubtypePredicate(SubType.ISLAND))); } public DrownedCatacomb(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DungroveElder.java b/Mage.Sets/src/mage/cards/d/DungroveElder.java index 25c9ab1f1f1..530fde31f19 100644 --- a/Mage.Sets/src/mage/cards/d/DungroveElder.java +++ b/Mage.Sets/src/mage/cards/d/DungroveElder.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; 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; @@ -51,7 +52,7 @@ public class DungroveElder extends CardImpl { final static FilterControlledPermanent filterLands = new FilterControlledPermanent("Forests you control"); static { - filterLands.add(new SubtypePredicate("Forest")); + filterLands.add(new SubtypePredicate(SubType.FOREST)); } public DungroveElder (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 e71b5323d11..3e3d9832647 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenDemolitionTeam.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenDemolitionTeam.java @@ -35,6 +35,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -51,7 +52,7 @@ public class DwarvenDemolitionTeam extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Wall"); static{ - filter.add(new SubtypePredicate("Wall")); + filter.add(new SubtypePredicate(SubType.WALL)); } public DwarvenDemolitionTeam(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 70b05cf42f2..cf78bd23072 100644 --- a/Mage.Sets/src/mage/cards/d/DwarvenPony.java +++ b/Mage.Sets/src/mage/cards/d/DwarvenPony.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -54,7 +55,7 @@ public class DwarvenPony extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Dwarf creature"); static { - filter.add(new SubtypePredicate("Dwarf")); + filter.add(new SubtypePredicate(SubType.DWARF)); } public DwarvenPony(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 79f440fe808..b14c2166c45 100644 --- a/Mage.Sets/src/mage/cards/d/DwynensElite.java +++ b/Mage.Sets/src/mage/cards/d/DwynensElite.java @@ -37,6 +37,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; 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; @@ -54,7 +55,7 @@ public class DwynensElite extends CardImpl { static { filter.add(new AnotherPredicate()); - filter.add(new SubtypePredicate("Elf")); + filter.add(new SubtypePredicate(SubType.ELF)); } public DwynensElite(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/Earthblighter.java b/Mage.Sets/src/mage/cards/e/Earthblighter.java index 21ae5600c8a..97420b7ed1f 100644 --- a/Mage.Sets/src/mage/cards/e/Earthblighter.java +++ b/Mage.Sets/src/mage/cards/e/Earthblighter.java @@ -37,6 +37,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -53,7 +54,7 @@ public class Earthblighter extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Goblin"); static { - filter.add(new SubtypePredicate("Goblin")); + filter.add(new SubtypePredicate(SubType.GOBLIN)); } 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 7864d006718..869a28c1c93 100644 --- a/Mage.Sets/src/mage/cards/e/EchoBaseCommando.java +++ b/Mage.Sets/src/mage/cards/e/EchoBaseCommando.java @@ -56,7 +56,7 @@ public class EchoBaseCommando extends CardImpl { private static final Filter filter = new FilterPermanent("Beasts"); static { - filter.add(new SubtypePredicate("Beast")); + filter.add(new SubtypePredicate(SubType.BEAST)); } public EchoBaseCommando(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 6f75f9300d8..ab45f2da45a 100644 --- a/Mage.Sets/src/mage/cards/e/Edgewalker.java +++ b/Mage.Sets/src/mage/cards/e/Edgewalker.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.cost.SpellsCostReductionControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -48,7 +49,7 @@ public class Edgewalker extends CardImpl { private static final FilterCard filter = new FilterCard("Cleric spells"); static { - filter.add(new SubtypePredicate("Cleric")); + filter.add(new SubtypePredicate(SubType.CLERIC)); } 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 3bfe1a00d9e..8db2d0d1b68 100644 --- a/Mage.Sets/src/mage/cards/e/EerieProcession.java +++ b/Mage.Sets/src/mage/cards/e/EerieProcession.java @@ -32,6 +32,7 @@ import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; 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; @@ -46,7 +47,7 @@ public class EerieProcession extends CardImpl { private static final FilterCard filter = new FilterCard("Arcane card"); static { - filter.add(new SubtypePredicate("Arcane")); + filter.add(new SubtypePredicate(SubType.ARCANE)); } public EerieProcession(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/ElvishEulogist.java b/Mage.Sets/src/mage/cards/e/ElvishEulogist.java index 6a9bdbaa63c..08e7c4c5745 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishEulogist.java +++ b/Mage.Sets/src/mage/cards/e/ElvishEulogist.java @@ -35,6 +35,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -50,7 +51,7 @@ public class ElvishEulogist extends CardImpl { private static final FilterCard filter = new FilterCard("Elf"); static { - filter.add(new SubtypePredicate("Elf")); + filter.add(new SubtypePredicate(SubType.ELF)); } public ElvishEulogist(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 a133d37a1d5..935adca5331 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishHandservant.java +++ b/Mage.Sets/src/mage/cards/e/ElvishHandservant.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -48,7 +49,7 @@ public class ElvishHandservant extends CardImpl { private static final FilterSpell filter = new FilterSpell("Giant"); static { - filter.add(new SubtypePredicate("Giant")); + filter.add(new SubtypePredicate(SubType.GIANT)); } public ElvishHandservant(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 ef29973e0f9..423399e1b1a 100644 --- a/Mage.Sets/src/mage/cards/e/EmeraldCharm.java +++ b/Mage.Sets/src/mage/cards/e/EmeraldCharm.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -54,7 +55,7 @@ public class EmeraldCharm extends CardImpl { private static final FilterEnchantmentPermanent filter = new FilterEnchantmentPermanent("non-Aura enchantment"); static { - filter.add(Predicates.not(new SubtypePredicate("Aura"))); + filter.add(Predicates.not(new SubtypePredicate(SubType.AURA))); } public EmeraldCharm(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EngulfTheShore.java b/Mage.Sets/src/mage/cards/e/EngulfTheShore.java index a48270372ca..afcaf0e3e1c 100644 --- a/Mage.Sets/src/mage/cards/e/EngulfTheShore.java +++ b/Mage.Sets/src/mage/cards/e/EngulfTheShore.java @@ -28,14 +28,11 @@ package mage.cards.e; import mage.abilities.Ability; -import mage.constants.ComparisonType; +import mage.constants.*; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; @@ -77,7 +74,7 @@ class EngulfTheShoreEffect extends OneShotEffect { private static final FilterControlledPermanent filter = new FilterControlledPermanent("number of Islands you control"); static { - filter.add(new SubtypePredicate("Island")); + filter.add(new SubtypePredicate(SubType.ISLAND)); } public EngulfTheShoreEffect() { diff --git a/Mage.Sets/src/mage/cards/e/ErhnamDjinn.java b/Mage.Sets/src/mage/cards/e/ErhnamDjinn.java index 1e15e2f3275..50242bb4863 100644 --- a/Mage.Sets/src/mage/cards/e/ErhnamDjinn.java +++ b/Mage.Sets/src/mage/cards/e/ErhnamDjinn.java @@ -34,10 +34,7 @@ import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.ForestwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.PhaseStep; -import mage.constants.TargetController; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -55,7 +52,7 @@ public class ErhnamDjinn extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Wall creature an opponent controls"); static { - filter.add(Predicates.not(new SubtypePredicate("Wall"))); + filter.add(Predicates.not(new SubtypePredicate(SubType.WALL))); filter.add(new ControllerPredicate(TargetController.OPPONENT)); } diff --git a/Mage.Sets/src/mage/cards/e/Everglades.java b/Mage.Sets/src/mage/cards/e/Everglades.java index 229d740d689..56b5e0aa8c5 100644 --- a/Mage.Sets/src/mage/cards/e/Everglades.java +++ b/Mage.Sets/src/mage/cards/e/Everglades.java @@ -37,6 +37,7 @@ import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.Predicates; @@ -55,7 +56,7 @@ public class Everglades extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("an untapped Swamp"); static { - filter.add(new SubtypePredicate("Swamp")); + filter.add(new SubtypePredicate(SubType.SWAMP)); filter.add(Predicates.not(new TappedPredicate())); } diff --git a/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java b/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java index 42725c22764..15f8b46a2fd 100644 --- a/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java +++ b/Mage.Sets/src/mage/cards/e/EvilEyeOfOrmsByGore.java @@ -34,10 +34,7 @@ import mage.abilities.effects.common.combat.CantAttackAnyPlayerAllEffect; import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -55,8 +52,8 @@ public class EvilEyeOfOrmsByGore extends CardImpl { private static final FilterCreaturePermanent cantBeBlockedByFilter = new FilterCreaturePermanent("except by Walls"); static { - cantBeBlockedByFilter.add(Predicates.not(new SubtypePredicate("Wall"))); - cantAttackFilter.add(Predicates.not((new SubtypePredicate("Eye")))); + cantBeBlockedByFilter.add(Predicates.not(new SubtypePredicate(SubType.WALL))); + cantAttackFilter.add(Predicates.not((new SubtypePredicate(SubType.EYE)))); 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 6a5b5d31e86..68901a47ee2 100644 --- a/Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java +++ b/Mage.Sets/src/mage/cards/e/EvilEyeOfUrborg.java @@ -34,10 +34,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.combat.CantAttackAnyPlayerAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -54,7 +51,7 @@ public class EvilEyeOfUrborg extends CardImpl { private static final FilterCreaturePermanent cantAttackFilter = new FilterCreaturePermanent("Non-Eye creatures you control"); static { - cantAttackFilter.add(Predicates.not((new SubtypePredicate("Eye")))); + cantAttackFilter.add(Predicates.not((new SubtypePredicate(SubType.EYE)))); cantAttackFilter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/f/Facevaulter.java b/Mage.Sets/src/mage/cards/f/Facevaulter.java index 7ddfd2a35cb..6d6537b73d4 100644 --- a/Mage.Sets/src/mage/cards/f/Facevaulter.java +++ b/Mage.Sets/src/mage/cards/f/Facevaulter.java @@ -35,10 +35,7 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Duration; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetControlledPermanent; @@ -54,7 +51,7 @@ public class Facevaulter extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Goblin"); static { - filter.add(new SubtypePredicate("Goblin")); + filter.add(new SubtypePredicate(SubType.GOBLIN)); } public Facevaulter(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 31be97e7cd0..5cdd3a4901f 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieNoble.java +++ b/Mage.Sets/src/mage/cards/f/FaerieNoble.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -54,7 +55,7 @@ public class FaerieNoble extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Faerie creatures"); static { - filter.add(new SubtypePredicate("Faerie")); + filter.add(new SubtypePredicate(SubType.FAERIE)); } public FaerieNoble(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/f/FeastOfBlood.java b/Mage.Sets/src/mage/cards/f/FeastOfBlood.java index 64ef68626c8..fb983e5e5dd 100644 --- a/Mage.Sets/src/mage/cards/f/FeastOfBlood.java +++ b/Mage.Sets/src/mage/cards/f/FeastOfBlood.java @@ -35,6 +35,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; 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.Game; @@ -75,7 +76,7 @@ class FeastOfBloodCost extends CostImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); static { - filter.add(new SubtypePredicate("Vampire")); + filter.add(new SubtypePredicate(SubType.VAMPIRE)); } public FeastOfBloodCost() { diff --git a/Mage.Sets/src/mage/cards/f/FendeepSummoner.java b/Mage.Sets/src/mage/cards/f/FendeepSummoner.java index c77aaa7e372..2f9b5eb7026 100644 --- a/Mage.Sets/src/mage/cards/f/FendeepSummoner.java +++ b/Mage.Sets/src/mage/cards/f/FendeepSummoner.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -52,7 +53,7 @@ public class FendeepSummoner extends CardImpl { static final FilterLandPermanent filter = new FilterLandPermanent("Swamp"); static { - filter.add(new SubtypePredicate("Swamp")); + filter.add(new SubtypePredicate(SubType.SWAMP)); } public FendeepSummoner(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 a592803062c..f6eea2e807d 100644 --- a/Mage.Sets/src/mage/cards/f/FieldMarshal.java +++ b/Mage.Sets/src/mage/cards/f/FieldMarshal.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -50,7 +51,7 @@ public class FieldMarshal extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Soldier creatures"); static { - filter.add(new SubtypePredicate("Soldier")); + filter.add(new SubtypePredicate(SubType.SOLDIER)); } 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 de213d45214..c8cc5dd30d8 100644 --- a/Mage.Sets/src/mage/cards/f/FiendOfTheShadows.java +++ b/Mage.Sets/src/mage/cards/f/FiendOfTheShadows.java @@ -60,7 +60,7 @@ public class FiendOfTheShadows extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a Human"); static { - filter.add(new SubtypePredicate("Human")); + filter.add(new SubtypePredicate(SubType.HUMAN)); } public FiendOfTheShadows(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 575f65a13c0..f8f5dbc804a 100644 --- a/Mage.Sets/src/mage/cards/f/Filth.java +++ b/Mage.Sets/src/mage/cards/f/Filth.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; @@ -58,7 +59,7 @@ public class Filth extends CardImpl { static { filter.add(new CardTypePredicate(CardType.LAND)); - filter.add(new SubtypePredicate("Swamp")); + filter.add(new SubtypePredicate(SubType.SWAMP)); } 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 47404474c2a..74f2babcd25 100644 --- a/Mage.Sets/src/mage/cards/f/FinalIteration.java +++ b/Mage.Sets/src/mage/cards/f/FinalIteration.java @@ -38,10 +38,7 @@ import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterSpell; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -62,7 +59,7 @@ public class FinalIteration extends CardImpl { private static final FilterSpell filterSpell = new FilterSpell("an instant or sorcery spell"); static { - filter.add(new SubtypePredicate("Wizard")); + filter.add(new SubtypePredicate(SubType.WIZARD)); filter.add(new ControllerPredicate(TargetController.YOU)); filterSpell.add(Predicates.or( new CardTypePredicate(CardType.INSTANT), diff --git a/Mage.Sets/src/mage/cards/f/FireDragon.java b/Mage.Sets/src/mage/cards/f/FireDragon.java index a12edf7cd41..0fa24e90140 100644 --- a/Mage.Sets/src/mage/cards/f/FireDragon.java +++ b/Mage.Sets/src/mage/cards/f/FireDragon.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; 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; @@ -52,7 +53,7 @@ public class FireDragon extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("for each Mountain you control"); static { - filter.add(new SubtypePredicate("Mountain")); + filter.add(new SubtypePredicate(SubType.MOUNTAIN)); } public FireDragon(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 ee1417e5f48..3fd8608e477 100644 --- a/Mage.Sets/src/mage/cards/f/FirecatBlitz.java +++ b/Mage.Sets/src/mage/cards/f/FirecatBlitz.java @@ -40,10 +40,7 @@ import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TimingRule; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -61,7 +58,7 @@ public class FirecatBlitz extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("Mountains"); static { - filter.add(new SubtypePredicate("Mountain")); + filter.add(new SubtypePredicate(SubType.MOUNTAIN)); } public FirecatBlitz(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 51336d214df..a5c64551341 100644 --- a/Mage.Sets/src/mage/cards/f/FlamekinBladewhirl.java +++ b/Mage.Sets/src/mage/cards/f/FlamekinBladewhirl.java @@ -34,6 +34,7 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.cards.CardImpl; 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; @@ -48,7 +49,7 @@ public class FlamekinBladewhirl extends CardImpl { private static final FilterCard filter = new FilterCard("an Elemental card from your hand"); static { - filter.add(new SubtypePredicate("Elemental")); + filter.add(new SubtypePredicate(SubType.ELEMENTAL)); } public FlamekinBladewhirl(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 8efde2f5ff4..74a5647362d 100644 --- a/Mage.Sets/src/mage/cards/f/FlamekinVillage.java +++ b/Mage.Sets/src/mage/cards/f/FlamekinVillage.java @@ -40,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -57,7 +58,7 @@ public class FlamekinVillage extends CardImpl { private static final FilterCard filter = new FilterCard("an Elemental card from your hand"); static { - filter.add(new SubtypePredicate("Elemental")); + filter.add(new SubtypePredicate(SubType.ELEMENTAL)); } public FlamekinVillage(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 13a15e2e79f..de73d4f646a 100644 --- a/Mage.Sets/src/mage/cards/f/FlamestickCourier.java +++ b/Mage.Sets/src/mage/cards/f/FlamestickCourier.java @@ -42,6 +42,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -58,7 +59,7 @@ public class FlamestickCourier extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Goblin creature"); static { - filter.add(new SubtypePredicate("Goblin")); + filter.add(new SubtypePredicate(SubType.GOBLIN)); } public FlamestickCourier(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 b4e1d1f174a..d9beb27d86d 100644 --- a/Mage.Sets/src/mage/cards/f/Flashfires.java +++ b/Mage.Sets/src/mage/cards/f/Flashfires.java @@ -31,6 +31,7 @@ import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -45,7 +46,7 @@ public class Flashfires extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Plains"); static{ - filter.add(new SubtypePredicate("Plains")); + filter.add(new SubtypePredicate(SubType.PLAINS)); } 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 1e1b05687d1..fc456c1fbad 100644 --- a/Mage.Sets/src/mage/cards/f/FleetingMemories.java +++ b/Mage.Sets/src/mage/cards/f/FleetingMemories.java @@ -35,6 +35,7 @@ import mage.abilities.effects.keyword.InvestigateEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -54,7 +55,7 @@ public class FleetingMemories extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Clue"); static { - filter.add(new SubtypePredicate("Clue")); + filter.add(new SubtypePredicate(SubType.CLUE)); } public FleetingMemories(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 a544e618eab..5aece9259ee 100644 --- a/Mage.Sets/src/mage/cards/f/FoulTongueInvocation.java +++ b/Mage.Sets/src/mage/cards/f/FoulTongueInvocation.java @@ -37,6 +37,7 @@ import mage.cards.CardSetInfo; import mage.constants.AbilityType; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -57,7 +58,7 @@ public class FoulTongueInvocation 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("Dragon")); + filter.add(new SubtypePredicate(SubType.DRAGON)); } public FoulTongueInvocation(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 c36ef5a166c..c2ec216b37e 100644 --- a/Mage.Sets/src/mage/cards/f/FrogtosserBanneret.java +++ b/Mage.Sets/src/mage/cards/f/FrogtosserBanneret.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; @@ -51,8 +52,8 @@ public class FrogtosserBanneret extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate("Goblin"), - new SubtypePredicate("Rogue"))); + new SubtypePredicate(SubType.GOBLIN), + new SubtypePredicate(SubType.ROGUE))); } public FrogtosserBanneret(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 1b63833e838..d8204bd573f 100644 --- a/Mage.Sets/src/mage/cards/f/Fruition.java +++ b/Mage.Sets/src/mage/cards/f/Fruition.java @@ -32,6 +32,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -46,7 +47,7 @@ public class Fruition extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("for each Forest on the battlefield"); static { - filter.add(new SubtypePredicate("Forest")); + filter.add(new SubtypePredicate(SubType.FOREST)); } 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 a704626722e..daac61f1fcd 100644 --- a/Mage.Sets/src/mage/cards/f/FugitiveDruid.java +++ b/Mage.Sets/src/mage/cards/f/FugitiveDruid.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -47,7 +48,7 @@ public class FugitiveDruid extends CardImpl { private static final FilterSpell filter = new FilterSpell("an Aura spell"); static { - filter.add(new SubtypePredicate("Aura")); + filter.add(new SubtypePredicate(SubType.AURA)); } public FugitiveDruid(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 98decb7ba37..d59f26d9397 100644 --- a/Mage.Sets/src/mage/cards/f/FungalBloom.java +++ b/Mage.Sets/src/mage/cards/f/FungalBloom.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterPermanent; @@ -51,7 +52,7 @@ public class FungalBloom extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Fungus"); static { - filter.add(new SubtypePredicate("Fungus")); + filter.add(new SubtypePredicate(SubType.FUNGUS)); } public FungalBloom(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 8a9503d2d20..7018db2c455 100644 --- a/Mage.Sets/src/mage/cards/g/GallowsWarden.java +++ b/Mage.Sets/src/mage/cards/g/GallowsWarden.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -49,7 +50,7 @@ public class GallowsWarden extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Spirit creatures"); static { - filter.add(new SubtypePredicate("Spirit")); + filter.add(new SubtypePredicate(SubType.SPIRIT)); } 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 14555bce92d..be4f537571b 100644 --- a/Mage.Sets/src/mage/cards/g/GameTrail.java +++ b/Mage.Sets/src/mage/cards/g/GameTrail.java @@ -35,6 +35,7 @@ import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -51,8 +52,8 @@ public 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("Mountain"), - new SubtypePredicate("Forest"))); + filter.add(Predicates.or(new SubtypePredicate(SubType.MOUNTAIN), + new SubtypePredicate(SubType.FOREST))); } public GameTrail(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 6c8adae7cb9..603322b2cb7 100644 --- a/Mage.Sets/src/mage/cards/g/GangrenousZombies.java +++ b/Mage.Sets/src/mage/cards/g/GangrenousZombies.java @@ -38,10 +38,7 @@ import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DamageEverythingEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ComparisonType; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -56,7 +53,7 @@ public class GangrenousZombies extends CardImpl { static { filter.add(new SupertypePredicate(SuperType.SNOW)); - filter.add(new SubtypePredicate("Swamp")); + filter.add(new SubtypePredicate(SubType.SWAMP)); } public GangrenousZombies(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GempalmAvenger.java b/Mage.Sets/src/mage/cards/g/GempalmAvenger.java index 8085521e834..81fe6aaf240 100644 --- a/Mage.Sets/src/mage/cards/g/GempalmAvenger.java +++ b/Mage.Sets/src/mage/cards/g/GempalmAvenger.java @@ -40,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -54,7 +55,7 @@ public class GempalmAvenger extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Soldier creatures"); static { - filter.add(new SubtypePredicate("Soldier")); + filter.add(new SubtypePredicate(SubType.SOLDIER)); } public GempalmAvenger(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 3a7750efed6..a58ebc56e5f 100644 --- a/Mage.Sets/src/mage/cards/g/GhosthelmCourier.java +++ b/Mage.Sets/src/mage/cards/g/GhosthelmCourier.java @@ -42,6 +42,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -58,7 +59,7 @@ public class GhosthelmCourier extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Wizard creature"); static { - filter.add(new SubtypePredicate("Wizard")); + filter.add(new SubtypePredicate(SubType.WIZARD)); } public GhosthelmCourier(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GiantsIre.java b/Mage.Sets/src/mage/cards/g/GiantsIre.java index 83bcffd151b..ab1b8486fc2 100644 --- a/Mage.Sets/src/mage/cards/g/GiantsIre.java +++ b/Mage.Sets/src/mage/cards/g/GiantsIre.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; 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; @@ -49,7 +50,7 @@ public class GiantsIre extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Giant"); static { - filter.add(new SubtypePredicate("Giant")); + filter.add(new SubtypePredicate(SubType.GIANT)); } public GiantsIre(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GisaAndGeralf.java b/Mage.Sets/src/mage/cards/g/GisaAndGeralf.java index 8ca97c61d8d..aa5dcf8f2eb 100644 --- a/Mage.Sets/src/mage/cards/g/GisaAndGeralf.java +++ b/Mage.Sets/src/mage/cards/g/GisaAndGeralf.java @@ -86,7 +86,7 @@ class GisaAndGeralfContinuousEffect extends ContinuousEffectImpl { private static final FilterCreatureCard filter = new FilterCreatureCard("Zombie creature card"); static { - filter.add(new SubtypePredicate("Zombie")); + filter.add(new SubtypePredicate(SubType.ZOMBIE)); } GisaAndGeralfContinuousEffect() { diff --git a/Mage.Sets/src/mage/cards/g/GlacialCrasher.java b/Mage.Sets/src/mage/cards/g/GlacialCrasher.java index 610779e6d3b..dad3fca074c 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialCrasher.java +++ b/Mage.Sets/src/mage/cards/g/GlacialCrasher.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -78,7 +79,7 @@ class GlacialCrasherEffect extends RestrictionEffect { private static final FilterLandPermanent filter = new FilterLandPermanent("Mountain"); static { - filter.add(new SubtypePredicate("Mountain")); + filter.add(new SubtypePredicate(SubType.MOUNTAIN)); } public GlacialCrasherEffect() { diff --git a/Mage.Sets/src/mage/cards/g/GnarlrootTrapper.java b/Mage.Sets/src/mage/cards/g/GnarlrootTrapper.java index ca8f9e2c2c7..32cf46faddb 100644 --- a/Mage.Sets/src/mage/cards/g/GnarlrootTrapper.java +++ b/Mage.Sets/src/mage/cards/g/GnarlrootTrapper.java @@ -45,6 +45,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -64,7 +65,7 @@ public class GnarlrootTrapper extends CardImpl { static { filter.add(new AttackingPredicate()); - filter.add(new SubtypePredicate("Elf")); + filter.add(new SubtypePredicate(SubType.ELF)); } public GnarlrootTrapper(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 dbb5c750326..764dabc74dd 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinLackey.java +++ b/Mage.Sets/src/mage/cards/g/GoblinLackey.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.PutPermanentOnBattlefieldEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -47,7 +48,7 @@ public class GoblinLackey extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("a Goblin permanent card"); static { - filter.add(new SubtypePredicate("Goblin")); + filter.add(new SubtypePredicate(SubType.GOBLIN)); } 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 f1cb074f855..66af2258586 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinLookout.java +++ b/Mage.Sets/src/mage/cards/g/GoblinLookout.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledPermanent; @@ -54,7 +55,7 @@ public class GoblinLookout extends CardImpl { private static final FilterControlledPermanent filterPermanent = new FilterControlledPermanent("a Goblin"); static { - filterPermanent.add(new SubtypePredicate("Goblin")); + filterPermanent.add(new SubtypePredicate(SubType.GOBLIN)); } 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 cec4aca2c10..111e4e952ba 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinMasons.java +++ b/Mage.Sets/src/mage/cards/g/GoblinMasons.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; 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; @@ -48,7 +49,7 @@ public class GoblinMasons extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Wall"); static { - filter.add(new SubtypePredicate("Wall")); + filter.add(new SubtypePredicate(SubType.WALL)); } diff --git a/Mage.Sets/src/mage/cards/g/GoblinRingleader.java b/Mage.Sets/src/mage/cards/g/GoblinRingleader.java index 1debf06e57d..55fb11de2c8 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinRingleader.java +++ b/Mage.Sets/src/mage/cards/g/GoblinRingleader.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -49,7 +50,7 @@ public class GoblinRingleader extends CardImpl { private static final FilterCard filter = new FilterCard("Goblin cards"); static { - filter.add(new SubtypePredicate("Goblin")); + filter.add(new SubtypePredicate(SubType.GOBLIN)); } public GoblinRingleader(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoblinSledder.java b/Mage.Sets/src/mage/cards/g/GoblinSledder.java index 7eefefc36e1..23dc3d784c2 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSledder.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSledder.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -53,7 +54,7 @@ public class GoblinSledder extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a Goblin"); static { - filter.add(new SubtypePredicate("Goblin")); + filter.add(new SubtypePredicate(SubType.GOBLIN)); } 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 c408810cb66..b06f2c7de30 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinSoothsayer.java +++ b/Mage.Sets/src/mage/cards/g/GoblinSoothsayer.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; @@ -59,7 +60,7 @@ public class GoblinSoothsayer extends CardImpl { static { filter.add(new ColorPredicate(ObjectColor.RED)); - filter2.add(new SubtypePredicate("Goblin")); + filter2.add(new SubtypePredicate(SubType.GOBLIN)); } 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 2788de404c8..3e4709babcc 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinTaskmaster.java +++ b/Mage.Sets/src/mage/cards/g/GoblinTaskmaster.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -53,7 +54,7 @@ public class GoblinTaskmaster extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Goblin creature"); static { - filter.add(new SubtypePredicate("Goblin")); + filter.add(new SubtypePredicate(SubType.GOBLIN)); } public GoblinTaskmaster(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 0de7f25519a..af84f73923f 100644 --- a/Mage.Sets/src/mage/cards/g/GraniteGrip.java +++ b/Mage.Sets/src/mage/cards/g/GraniteGrip.java @@ -52,7 +52,7 @@ public class GraniteGrip extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Mountain you control"); static { - filter.add(new SubtypePredicate("Mountain")); + filter.add(new SubtypePredicate(SubType.MOUNTAIN)); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/g/Greedo.java b/Mage.Sets/src/mage/cards/g/Greedo.java index 2f03867cdc2..244bf601a08 100644 --- a/Mage.Sets/src/mage/cards/g/Greedo.java +++ b/Mage.Sets/src/mage/cards/g/Greedo.java @@ -35,10 +35,7 @@ import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -58,7 +55,7 @@ public class Greedo extends CardImpl { private static final FilterCard filterCard = new FilterCard("Hunter or Rogue card"); static { - filterCard.add(Predicates.or(new SubtypePredicate("Rogue"), new SubtypePredicate("Hunter"))); + filterCard.add(Predicates.or(new SubtypePredicate(SubType.ROGUE), new SubtypePredicate(SubType.HUNTER))); } diff --git a/Mage.Sets/src/mage/cards/g/GriffinRider.java b/Mage.Sets/src/mage/cards/g/GriffinRider.java index 78efcb34017..92eecf159f5 100644 --- a/Mage.Sets/src/mage/cards/g/GriffinRider.java +++ b/Mage.Sets/src/mage/cards/g/GriffinRider.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; @@ -56,7 +57,7 @@ public class GriffinRider extends CardImpl { private static final FilterPermanent filterGriffinCard = new FilterCreaturePermanent(); static { - filterGriffinCard.add(new SubtypePredicate("Griffin")); + filterGriffinCard.add(new SubtypePredicate(SubType.GRIFFIN)); } public GriffinRider(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GripOfPhyresis.java b/Mage.Sets/src/mage/cards/g/GripOfPhyresis.java index 2af84b5d35b..f8fbd74a252 100644 --- a/Mage.Sets/src/mage/cards/g/GripOfPhyresis.java +++ b/Mage.Sets/src/mage/cards/g/GripOfPhyresis.java @@ -34,6 +34,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -56,7 +57,7 @@ public class GripOfPhyresis extends CardImpl { static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); - filter.add(new SubtypePredicate("Equipment")); + filter.add(new SubtypePredicate(SubType.EQUIPMENT)); } 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 2dd6af9c783..13b14bc8e95 100644 --- a/Mage.Sets/src/mage/cards/g/GrixisPanorama.java +++ b/Mage.Sets/src/mage/cards/g/GrixisPanorama.java @@ -36,10 +36,7 @@ import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -61,9 +58,9 @@ public class GrixisPanorama extends CardImpl { filter.add(new CardTypePredicate(CardType.LAND)); filter.add(new SupertypePredicate(SuperType.BASIC)); filter.add(Predicates.or( - new SubtypePredicate("Island"), - new SubtypePredicate("Swamp"), - new SubtypePredicate("Mountain"))); + new SubtypePredicate(SubType.ISLAND), + new SubtypePredicate(SubType.SWAMP), + new SubtypePredicate(SubType.MOUNTAIN))); } public GrixisPanorama(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GuardianOfCloverdell.java b/Mage.Sets/src/mage/cards/g/GuardianOfCloverdell.java index 3cddb22e3f9..c3bf74db852 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianOfCloverdell.java +++ b/Mage.Sets/src/mage/cards/g/GuardianOfCloverdell.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ColoredManaSymbol; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -56,7 +57,7 @@ public class GuardianOfCloverdell extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Kithkin"); static { - filter.add(new SubtypePredicate("Kithkin")); + filter.add(new SubtypePredicate(SubType.KITHKIN)); } public GuardianOfCloverdell(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 e2f114d65dc..a6f27e07777 100644 --- a/Mage.Sets/src/mage/cards/h/HagHedgeMage.java +++ b/Mage.Sets/src/mage/cards/h/HagHedgeMage.java @@ -39,6 +39,7 @@ import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; 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.TargetPlayer; @@ -55,8 +56,8 @@ public class HagHedgeMage extends CardImpl { private final static FilterLandPermanent filter2 = new FilterLandPermanent(); static { - filter.add(new SubtypePredicate("Swamp")); - filter2.add(new SubtypePredicate("Forest")); + filter.add(new SubtypePredicate(SubType.SWAMP)); + filter2.add(new SubtypePredicate(SubType.FOREST)); } 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/HamletCaptain.java b/Mage.Sets/src/mage/cards/h/HamletCaptain.java index 972eed1e382..6a66aaf1014 100644 --- a/Mage.Sets/src/mage/cards/h/HamletCaptain.java +++ b/Mage.Sets/src/mage/cards/h/HamletCaptain.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -47,7 +48,7 @@ public class HamletCaptain extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Humans"); static { - filter.add(new SubtypePredicate("Human")); + filter.add(new SubtypePredicate(SubType.HUMAN)); } 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 9c42274e153..9bcc37db29b 100644 --- a/Mage.Sets/src/mage/cards/h/HammerOfRuin.java +++ b/Mage.Sets/src/mage/cards/h/HammerOfRuin.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -105,7 +106,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("Equipment")); + filter.add(new SubtypePredicate(SubType.EQUIPMENT)); 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/HanSolo.java b/Mage.Sets/src/mage/cards/h/HanSolo.java index 149b61f960c..7a481edaa50 100644 --- a/Mage.Sets/src/mage/cards/h/HanSolo.java +++ b/Mage.Sets/src/mage/cards/h/HanSolo.java @@ -53,7 +53,7 @@ public class HanSolo extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Starship you control"); static { - filter.add(new SubtypePredicate("Starship")); + filter.add(new SubtypePredicate(SubType.STARSHIP)); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/h/HarabazDruid.java b/Mage.Sets/src/mage/cards/h/HarabazDruid.java index d45d954b2b1..75ad52d1ec0 100644 --- a/Mage.Sets/src/mage/cards/h/HarabazDruid.java +++ b/Mage.Sets/src/mage/cards/h/HarabazDruid.java @@ -36,6 +36,7 @@ import mage.abilities.mana.DynamicManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -47,7 +48,7 @@ public class HarabazDruid extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Allies you control"); static { - filter.add(new SubtypePredicate("Ally")); + filter.add(new SubtypePredicate(SubType.ALLY)); } 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 1580409b8f2..351a09fb6de 100644 --- a/Mage.Sets/src/mage/cards/h/HarbingerOfSpring.java +++ b/Mage.Sets/src/mage/cards/h/HarbingerOfSpring.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.SoulshiftAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -46,7 +47,7 @@ public class HarbingerOfSpring extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Spirit creatures"); static { - filter.add(Predicates.not(new SubtypePredicate("Spirit"))); + filter.add(Predicates.not(new SubtypePredicate(SubType.SPIRIT))); } public HarbingerOfSpring(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 f360f8351a6..de4b97b579a 100644 --- a/Mage.Sets/src/mage/cards/h/HazezonTamar.java +++ b/Mage.Sets/src/mage/cards/h/HazezonTamar.java @@ -43,6 +43,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterCreaturePermanent; @@ -60,8 +61,8 @@ public class HazezonTamar extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Sand Warriors"); static { - filter.add(new SubtypePredicate("Sand")); - filter.add(new SubtypePredicate("Warrior")); + filter.add(new SubtypePredicate(SubType.SAND)); + filter.add(new SubtypePredicate(SubType.WARRIOR)); } 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 e5ce49d1007..a338a2da46c 100644 --- a/Mage.Sets/src/mage/cards/h/HeWhoHungers.java +++ b/Mage.Sets/src/mage/cards/h/HeWhoHungers.java @@ -44,6 +44,7 @@ import mage.abilities.keyword.SoulshiftAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; @@ -61,7 +62,7 @@ public class HeWhoHungers extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Spirit"); static { - filter.add(new SubtypePredicate("Spirit")); + filter.add(new SubtypePredicate(SubType.SPIRIT)); } public HeWhoHungers(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 6f3646d99eb..24de8d6381d 100644 --- a/Mage.Sets/src/mage/cards/h/HeliodsPilgrim.java +++ b/Mage.Sets/src/mage/cards/h/HeliodsPilgrim.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -49,7 +50,7 @@ public class HeliodsPilgrim extends CardImpl { static { filter.add(new CardTypePredicate(CardType.ENCHANTMENT)); - filter.add(new SubtypePredicate("Aura")); + filter.add(new SubtypePredicate(SubType.AURA)); } 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 9e81f90de7a..43ed2077b0d 100644 --- a/Mage.Sets/src/mage/cards/h/HeraldOfDromoka.java +++ b/Mage.Sets/src/mage/cards/h/HeraldOfDromoka.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -52,7 +53,7 @@ public class HeraldOfDromoka extends CardImpl { static { filter.add(new CardTypePredicate(CardType.CREATURE)); - filter.add(new SubtypePredicate("Warrior")); + filter.add(new SubtypePredicate(SubType.WARRIOR)); filter.add(new AnotherPredicate()); } diff --git a/Mage.Sets/src/mage/cards/h/HinterlandHarbor.java b/Mage.Sets/src/mage/cards/h/HinterlandHarbor.java index 50b816f6bd8..8bc45707818 100644 --- a/Mage.Sets/src/mage/cards/h/HinterlandHarbor.java +++ b/Mage.Sets/src/mage/cards/h/HinterlandHarbor.java @@ -40,6 +40,7 @@ import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -54,7 +55,7 @@ public class HinterlandHarbor extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(Predicates.or(new SubtypePredicate("Forest"), new SubtypePredicate("Island"))); + filter.add(Predicates.or(new SubtypePredicate(SubType.FOREST), new SubtypePredicate(SubType.ISLAND))); } public HinterlandHarbor(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 193b7fcf2c7..45f3f25e1ed 100644 --- a/Mage.Sets/src/mage/cards/h/HondenOfNightsReach.java +++ b/Mage.Sets/src/mage/cards/h/HondenOfNightsReach.java @@ -35,6 +35,7 @@ import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterControlledPermanent; @@ -51,7 +52,7 @@ public class HondenOfNightsReach extends CardImpl { final static FilterControlledPermanent filter = new FilterControlledPermanent("Shrine"); static { - filter.add(new SubtypePredicate("Shrine")); + filter.add(new SubtypePredicate(SubType.SHRINE)); } public HondenOfNightsReach(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 da5a4da36e3..8efe5ae150c 100644 --- a/Mage.Sets/src/mage/cards/h/HornedSliver.java +++ b/Mage.Sets/src/mage/cards/h/HornedSliver.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -49,7 +50,7 @@ public class HornedSliver extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("All Sliver creatures"); static { - filter.add(new SubtypePredicate("Sliver")); + filter.add(new SubtypePredicate(SubType.SLIVER)); } public HornedSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HumanFrailty.java b/Mage.Sets/src/mage/cards/h/HumanFrailty.java index 140e18f90d9..fc3d5fa2715 100644 --- a/Mage.Sets/src/mage/cards/h/HumanFrailty.java +++ b/Mage.Sets/src/mage/cards/h/HumanFrailty.java @@ -31,6 +31,7 @@ import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.TargetPermanent; @@ -45,7 +46,7 @@ public class HumanFrailty extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Human creature"); static { - filter.add(new SubtypePredicate("Human")); + filter.add(new SubtypePredicate(SubType.HUMAN)); } public HumanFrailty(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 5454307b3b5..efe272e04aa 100644 --- a/Mage.Sets/src/mage/cards/h/HuntingWilds.java +++ b/Mage.Sets/src/mage/cards/h/HuntingWilds.java @@ -46,6 +46,7 @@ import mage.cards.CardsImpl; import mage.constants.CardType; 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; @@ -66,7 +67,7 @@ public class HuntingWilds extends CardImpl { this.addAbility(new KickerAbility("{3}{G}")); FilterLandCard filter = new FilterLandCard("Forest card"); - filter.add(new SubtypePredicate("Forest")); + filter.add(new SubtypePredicate(SubType.FOREST)); // 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/i/ImperiousPerfect.java b/Mage.Sets/src/mage/cards/i/ImperiousPerfect.java index 8052f01888f..255c3f41222 100644 --- a/Mage.Sets/src/mage/cards/i/ImperiousPerfect.java +++ b/Mage.Sets/src/mage/cards/i/ImperiousPerfect.java @@ -53,7 +53,7 @@ public class ImperiousPerfect extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Elf creatures"); static { - filter.add(new SubtypePredicate("Elf")); + filter.add(new SubtypePredicate(SubType.ELF)); } public ImperiousPerfect(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 3b63f1687fe..bc20befdd12 100644 --- a/Mage.Sets/src/mage/cards/i/InameDeathAspect.java +++ b/Mage.Sets/src/mage/cards/i/InameDeathAspect.java @@ -35,10 +35,7 @@ import mage.abilities.effects.SearchEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.CardsImpl; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -76,7 +73,7 @@ class InameDeathAspectEffect extends SearchEffect { private static final FilterCard filter = new FilterCard(); static { - filter.add(new SubtypePredicate("Spirit")); + filter.add(new SubtypePredicate(SubType.SPIRIT)); } public InameDeathAspectEffect() { diff --git a/Mage.Sets/src/mage/cards/i/InameLifeAspect.java b/Mage.Sets/src/mage/cards/i/InameLifeAspect.java index 8d984058ac0..3f2f8bddc4d 100644 --- a/Mage.Sets/src/mage/cards/i/InameLifeAspect.java +++ b/Mage.Sets/src/mage/cards/i/InameLifeAspect.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -57,7 +58,7 @@ public class InameLifeAspect extends CardImpl { private static final FilterCard filter = new FilterCard("Spirit cards from your graveyard"); static { - filter.add(new SubtypePredicate("Spirit")); + filter.add(new SubtypePredicate(SubType.SPIRIT)); } public InameLifeAspect(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 02e929a53d9..bcbc6310be9 100644 --- a/Mage.Sets/src/mage/cards/i/Invisibility.java +++ b/Mage.Sets/src/mage/cards/i/Invisibility.java @@ -50,7 +50,7 @@ public class Invisibility extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("except by Walls"); static { - filter.add(Predicates.not(new SubtypePredicate("Wall"))); + filter.add(Predicates.not(new SubtypePredicate(SubType.WALL))); } public Invisibility(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 8e9df2d9c20..052f549d5b6 100644 --- a/Mage.Sets/src/mage/cards/i/IreOfKaminari.java +++ b/Mage.Sets/src/mage/cards/i/IreOfKaminari.java @@ -33,6 +33,7 @@ import mage.abilities.dynamicvalue.common.CardsInControllerGraveyardCount; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreatureOrPlayer; @@ -46,7 +47,7 @@ public class IreOfKaminari extends CardImpl { private static final FilterCard filter = new FilterCard("Arcane"); static { - filter.add(new SubtypePredicate("Arcane")); + filter.add(new SubtypePredicate(SubType.ARCANE)); } public IreOfKaminari(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 4f77ce7c138..0d39839e7f1 100644 --- a/Mage.Sets/src/mage/cards/i/IroncladSlayer.java +++ b/Mage.Sets/src/mage/cards/i/IroncladSlayer.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -50,7 +51,7 @@ public class IroncladSlayer extends CardImpl { private final static FilterCard filter = new FilterCard("Aura or Equipment card from your graveyard"); static { - filter.add(Predicates.or(new SubtypePredicate("Aura"), new SubtypePredicate("Equipment"))); + filter.add(Predicates.or(new SubtypePredicate(SubType.AURA), new SubtypePredicate(SubType.EQUIPMENT))); } public IroncladSlayer(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 1c6e79ee1ac..6aeaa7054ee 100644 --- a/Mage.Sets/src/mage/cards/i/IshkanahGrafwidow.java +++ b/Mage.Sets/src/mage/cards/i/IshkanahGrafwidow.java @@ -41,6 +41,7 @@ import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; @@ -59,7 +60,7 @@ public class IshkanahGrafwidow extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Spider you control"); static { - filter.add(new SubtypePredicate("Spider")); + filter.add(new SubtypePredicate(SubType.SPIDER)); } 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 b7c2a199477..6e8e6ced28e 100644 --- a/Mage.Sets/src/mage/cards/i/IsolatedChapel.java +++ b/Mage.Sets/src/mage/cards/i/IsolatedChapel.java @@ -40,6 +40,7 @@ import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SubType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -54,7 +55,7 @@ public class IsolatedChapel extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(Predicates.or(new SubtypePredicate("Plains"), new SubtypePredicate("Swamp"))); + filter.add(Predicates.or(new SubtypePredicate(SubType.PLAINS), new SubtypePredicate(SubType.SWAMP))); } public IsolatedChapel(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KaaliaOfTheVast.java b/Mage.Sets/src/mage/cards/k/KaaliaOfTheVast.java index 416f6df89d6..0bb2a01ec53 100644 --- a/Mage.Sets/src/mage/cards/k/KaaliaOfTheVast.java +++ b/Mage.Sets/src/mage/cards/k/KaaliaOfTheVast.java @@ -36,10 +36,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -127,9 +124,9 @@ class KaaliaOfTheVastEffect extends OneShotEffect { static { filter.add(Predicates.or( - new SubtypePredicate("Angel"), - new SubtypePredicate("Demon"), - new SubtypePredicate("Dragon"))); + new SubtypePredicate(SubType.ANGEL), + new SubtypePredicate(SubType.DEMON), + new SubtypePredicate(SubType.DRAGON))); } public KaaliaOfTheVastEffect() { diff --git a/Mage.Sets/src/mage/cards/k/KalonianTwingrove.java b/Mage.Sets/src/mage/cards/k/KalonianTwingrove.java index d70b3ad200a..e3c061e6f57 100644 --- a/Mage.Sets/src/mage/cards/k/KalonianTwingrove.java +++ b/Mage.Sets/src/mage/cards/k/KalonianTwingrove.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; 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; @@ -54,7 +55,7 @@ public class KalonianTwingrove extends CardImpl { final static FilterControlledPermanent filterLands = new FilterControlledPermanent("Forests you control"); static { - filterLands.add(new SubtypePredicate("Forest")); + filterLands.add(new SubtypePredicate(SubType.FOREST)); } 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 568ef385e05..8ce1d3b45b4 100644 --- a/Mage.Sets/src/mage/cards/k/KaminoCloningFacility.java +++ b/Mage.Sets/src/mage/cards/k/KaminoCloningFacility.java @@ -39,6 +39,7 @@ import mage.abilities.mana.conditional.ConditionalSpellManaBuilder; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -53,7 +54,7 @@ public class KaminoCloningFacility extends CardImpl { private static final FilterSpell FILTER = new FilterSpell("a Trooper spell"); static { - FILTER.add(new SubtypePredicate("Trooper")); + FILTER.add(new SubtypePredicate(SubType.TROOPER)); } public KaminoCloningFacility(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KarametraGodOfHarvests.java b/Mage.Sets/src/mage/cards/k/KarametraGodOfHarvests.java index d12b34eec2d..78f6f4e4a67 100644 --- a/Mage.Sets/src/mage/cards/k/KarametraGodOfHarvests.java +++ b/Mage.Sets/src/mage/cards/k/KarametraGodOfHarvests.java @@ -37,10 +37,7 @@ import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.filter.predicate.Predicates; @@ -59,8 +56,8 @@ public class KarametraGodOfHarvests extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate("Forest"), - new SubtypePredicate("Plains"))); + new SubtypePredicate(SubType.FOREST), + new SubtypePredicate(SubType.PLAINS))); } public KarametraGodOfHarvests(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 f64234f4cc7..e63a0056c4c 100644 --- a/Mage.Sets/src/mage/cards/k/Karma.java +++ b/Mage.Sets/src/mage/cards/k/Karma.java @@ -37,6 +37,7 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; @@ -74,7 +75,7 @@ class KarmaDamageTargetEffect extends OneShotEffect{ private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("Swamps"); static{ - filter.add(new SubtypePredicate("Swamp")); + filter.add(new SubtypePredicate(SubType.SWAMP)); } public KarmaDamageTargetEffect() diff --git a/Mage.Sets/src/mage/cards/k/KavuMonarch.java b/Mage.Sets/src/mage/cards/k/KavuMonarch.java index 7f50cef2900..a1da4db7070 100644 --- a/Mage.Sets/src/mage/cards/k/KavuMonarch.java +++ b/Mage.Sets/src/mage/cards/k/KavuMonarch.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; @@ -54,8 +55,8 @@ public class KavuMonarch extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("another Kavu"); static { - filter1.add(new SubtypePredicate("Kavu")); - filter2.add(new SubtypePredicate("Kavu")); + filter1.add(new SubtypePredicate(SubType.KAVU)); + filter2.add(new SubtypePredicate(SubType.KAVU)); filter2.add(new AnotherPredicate()); } diff --git a/Mage.Sets/src/mage/cards/k/KinsbaileCavalier.java b/Mage.Sets/src/mage/cards/k/KinsbaileCavalier.java index 7fef86a817f..90eac3e6fe6 100644 --- a/Mage.Sets/src/mage/cards/k/KinsbaileCavalier.java +++ b/Mage.Sets/src/mage/cards/k/KinsbaileCavalier.java @@ -31,6 +31,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; @@ -50,7 +51,7 @@ public class KinsbaileCavalier extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Knight creatures"); static { - filter.add(new SubtypePredicate("Knight")); + filter.add(new SubtypePredicate(SubType.KNIGHT)); } 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 6d28359f119..156acf11121 100644 --- a/Mage.Sets/src/mage/cards/k/KirdApe.java +++ b/Mage.Sets/src/mage/cards/k/KirdApe.java @@ -38,6 +38,7 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -52,7 +53,7 @@ public class KirdApe extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("a Forest"); static { - filter.add(new SubtypePredicate("Forest")); + filter.add(new SubtypePredicate(SubType.FOREST)); } 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 0b3b07eb96e..edfdf3c4bf5 100644 --- a/Mage.Sets/src/mage/cards/k/KirdChieftain.java +++ b/Mage.Sets/src/mage/cards/k/KirdChieftain.java @@ -44,6 +44,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -59,7 +60,7 @@ public class KirdChieftain extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("a Forest"); static { - filter.add(new SubtypePredicate("Forest")); + filter.add(new SubtypePredicate(SubType.FOREST)); } public KirdChieftain(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 55ceb742b2e..24c1d1841f1 100644 --- a/Mage.Sets/src/mage/cards/k/KithkinMourncaller.java +++ b/Mage.Sets/src/mage/cards/k/KithkinMourncaller.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterAttackingCreature; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -47,7 +48,7 @@ public class KithkinMourncaller extends CardImpl { private static final FilterAttackingCreature filter = new FilterAttackingCreature("an attacking Kithkin or Elf"); static { - filter.add(Predicates.or(new SubtypePredicate("Kithkin"), new SubtypePredicate("Elf"))); + filter.add(Predicates.or(new SubtypePredicate(SubType.KITHKIN), new SubtypePredicate(SubType.ELF))); } public KithkinMourncaller(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 aeaa1aaa928..e985364de8c 100644 --- a/Mage.Sets/src/mage/cards/k/KjeldoranOutpost.java +++ b/Mage.Sets/src/mage/cards/k/KjeldoranOutpost.java @@ -40,6 +40,7 @@ import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -55,7 +56,7 @@ public class KjeldoranOutpost extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Plains"); static { - filter.add(new SubtypePredicate("Plains")); + filter.add(new SubtypePredicate(SubType.PLAINS)); } public KjeldoranOutpost(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 170b0439417..a9340592f51 100644 --- a/Mage.Sets/src/mage/cards/k/KnightOfTheReliquary.java +++ b/Mage.Sets/src/mage/cards/k/KnightOfTheReliquary.java @@ -28,10 +28,8 @@ package mage.cards.k; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; + +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -62,7 +60,7 @@ public class KnightOfTheReliquary extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("Forest or Plains"); static { - filter.add(Predicates.or(new SubtypePredicate("Forest"), new SubtypePredicate("Plains"))); + filter.add(Predicates.or(new SubtypePredicate(SubType.FOREST), new SubtypePredicate(SubType.PLAINS))); } public KnightOfTheReliquary(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 0e9217453f1..2152ac32440 100644 --- a/Mage.Sets/src/mage/cards/k/KodamaOfTheCenterTree.java +++ b/Mage.Sets/src/mage/cards/k/KodamaOfTheCenterTree.java @@ -34,10 +34,7 @@ import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; import mage.abilities.keyword.SoulshiftAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -52,7 +49,7 @@ public class KodamaOfTheCenterTree extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Spirits you control"); static { - filter.add(new SubtypePredicate("Spirit")); + filter.add(new SubtypePredicate(SubType.SPIRIT)); } public KodamaOfTheCenterTree(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 d8d589df0ba..71f5635fbf7 100644 --- a/Mage.Sets/src/mage/cards/k/KorlashHeirToBlackblade.java +++ b/Mage.Sets/src/mage/cards/k/KorlashHeirToBlackblade.java @@ -39,10 +39,7 @@ import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterLandCard; @@ -60,8 +57,8 @@ public 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("Swamp")); - filterCard.add(new SubtypePredicate("Swamp")); + filterPermanent.add(new SubtypePredicate(SubType.SWAMP)); + filterCard.add(new SubtypePredicate(SubType.SWAMP)); } public KorlashHeirToBlackblade(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 8a0a4ad125d..67ab4b068ec 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanWarchief.java +++ b/Mage.Sets/src/mage/cards/k/KrosanWarchief.java @@ -29,6 +29,7 @@ package mage.cards.k; import java.util.UUID; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; @@ -54,8 +55,8 @@ public class KrosanWarchief extends CardImpl { private static final FilterCreaturePermanent filterTarget = new FilterCreaturePermanent("Beast"); static { - filter.add(new SubtypePredicate("Beast")); - filterTarget.add(new SubtypePredicate("Beast")); + filter.add(new SubtypePredicate(SubType.BEAST)); + filterTarget.add(new SubtypePredicate(SubType.BEAST)); } 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 97a6544cc3f..17b9c8f116c 100644 --- a/Mage.Sets/src/mage/cards/k/KrovikanMist.java +++ b/Mage.Sets/src/mage/cards/k/KrovikanMist.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; 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; @@ -50,7 +51,7 @@ public class KrovikanMist extends CardImpl { private static final FilterControlledPermanent controlledIllusionsFilter = new FilterControlledPermanent("Illusions you control"); static { - controlledIllusionsFilter.add(new SubtypePredicate("Illusion")); + controlledIllusionsFilter.add(new SubtypePredicate(SubType.ILLUSION)); } public KrovikanMist(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LanternScout.java b/Mage.Sets/src/mage/cards/l/LanternScout.java index 67caaee3900..97e84b451ba 100644 --- a/Mage.Sets/src/mage/cards/l/LanternScout.java +++ b/Mage.Sets/src/mage/cards/l/LanternScout.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; @@ -61,7 +62,7 @@ public class LanternScout extends CardImpl { FilterPermanent filter = new FilterPermanent("{this} or another Ally"); filter.add(Predicates.or( new CardIdPredicate(this.getId()), - new SubtypePredicate("Ally"))); + new SubtypePredicate(SubType.ALLY))); // 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/LastStand.java b/Mage.Sets/src/mage/cards/l/LastStand.java index 0700bb942e2..fd8e4f6d1e3 100644 --- a/Mage.Sets/src/mage/cards/l/LastStand.java +++ b/Mage.Sets/src/mage/cards/l/LastStand.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; 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; @@ -77,11 +78,11 @@ class LastStandEffect extends OneShotEffect { private static final FilterControlledLandPermanent filterForest = new FilterControlledLandPermanent(); private static final FilterControlledLandPermanent filterIsland = new FilterControlledLandPermanent(); static { - filterSwamp.add(new SubtypePredicate("Swamp")); - filterMountain.add(new SubtypePredicate("Mountain")); - filterPlains.add(new SubtypePredicate("Plains")); - filterForest.add(new SubtypePredicate("Forest")); - filterIsland.add(new SubtypePredicate("Island")); + 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)); } public LastStandEffect() { diff --git a/Mage.Sets/src/mage/cards/l/LegionsOfLimDul.java b/Mage.Sets/src/mage/cards/l/LegionsOfLimDul.java index 843a84757c0..b2fc48d8bd0 100644 --- a/Mage.Sets/src/mage/cards/l/LegionsOfLimDul.java +++ b/Mage.Sets/src/mage/cards/l/LegionsOfLimDul.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.LandwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -49,7 +50,7 @@ public class LegionsOfLimDul extends CardImpl { static { filter.add(new SupertypePredicate(SuperType.SNOW)); - filter.add(new SubtypePredicate("Swamp")); + filter.add(new SubtypePredicate(SubType.SWAMP )); } public LegionsOfLimDul(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LichLordOfUnx.java b/Mage.Sets/src/mage/cards/l/LichLordOfUnx.java index bd47f0f39ff..391ab999fe2 100644 --- a/Mage.Sets/src/mage/cards/l/LichLordOfUnx.java +++ b/Mage.Sets/src/mage/cards/l/LichLordOfUnx.java @@ -40,6 +40,7 @@ import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -55,7 +56,7 @@ public class LichLordOfUnx extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Zombies you control"); static { - filter.add(new SubtypePredicate("Zombie")); + filter.add(new SubtypePredicate(SubType.ZOMBIE)); } public LichLordOfUnx(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/Lifeblood.java b/Mage.Sets/src/mage/cards/l/Lifeblood.java index 74d19faa4fe..702af6c26b2 100644 --- a/Mage.Sets/src/mage/cards/l/Lifeblood.java +++ b/Mage.Sets/src/mage/cards/l/Lifeblood.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -47,7 +48,7 @@ public class Lifeblood extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("a Mountain an opponent controls"); static { - filter.add(new SubtypePredicate("Mountain")); + filter.add(new SubtypePredicate(SubType.MOUNTAIN)); filter.add(new ControllerPredicate(TargetController.OPPONENT)); } diff --git a/Mage.Sets/src/mage/cards/l/LilianaDeathsMajesty.java b/Mage.Sets/src/mage/cards/l/LilianaDeathsMajesty.java index ab62477845b..1e0f44f9fe9 100644 --- a/Mage.Sets/src/mage/cards/l/LilianaDeathsMajesty.java +++ b/Mage.Sets/src/mage/cards/l/LilianaDeathsMajesty.java @@ -38,6 +38,7 @@ import mage.abilities.effects.common.continuous.BecomesBlackZombieAdditionEffect import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -54,7 +55,7 @@ public class LilianaDeathsMajesty extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Zombie creatures"); static { - filter.add(Predicates.not(new SubtypePredicate("Zombie"))); + filter.add(Predicates.not(new SubtypePredicate(SubType.ZOMBIE))); } public LilianaDeathsMajesty(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LilianasMastery.java b/Mage.Sets/src/mage/cards/l/LilianasMastery.java index 36979f91662..9086de754fd 100644 --- a/Mage.Sets/src/mage/cards/l/LilianasMastery.java +++ b/Mage.Sets/src/mage/cards/l/LilianasMastery.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -50,7 +51,7 @@ public class LilianasMastery extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Zombie creatures"); static { - filter.add(new SubtypePredicate("Zombie")); + filter.add(new SubtypePredicate(SubType.ZOMBIE)); } public LilianasMastery(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 43246471af6..71dbef29dca 100644 --- a/Mage.Sets/src/mage/cards/l/LongForgottenGohei.java +++ b/Mage.Sets/src/mage/cards/l/LongForgottenGohei.java @@ -33,6 +33,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; @@ -54,8 +55,8 @@ public class LongForgottenGohei extends CardImpl { private static final FilterCreaturePermanent spiritFilter = new FilterCreaturePermanent("Spirit creatures"); static { - arcaneFilter.add(new SubtypePredicate("Arcane")); - spiritFilter.add(new SubtypePredicate("Spirit")); + arcaneFilter.add(new SubtypePredicate(SubType.ARCANE)); + spiritFilter.add(new SubtypePredicate(SubType.SPIRIT)); } public LongForgottenGohei(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 5dafbd8cfd7..edeb7f8ccc2 100644 --- a/Mage.Sets/src/mage/cards/l/LowlandOaf.java +++ b/Mage.Sets/src/mage/cards/l/LowlandOaf.java @@ -42,11 +42,7 @@ import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; @@ -64,7 +60,7 @@ public class LowlandOaf extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Goblin creature you control"); static { - filter.add(new SubtypePredicate("Goblin")); + filter.add(new SubtypePredicate(SubType.GOBLIN)); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/l/LysAlanaBowmaster.java b/Mage.Sets/src/mage/cards/l/LysAlanaBowmaster.java index 465355cb194..a08d4d7d704 100644 --- a/Mage.Sets/src/mage/cards/l/LysAlanaBowmaster.java +++ b/Mage.Sets/src/mage/cards/l/LysAlanaBowmaster.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SubType; import mage.filter.FilterSpell; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; @@ -53,7 +54,7 @@ public class LysAlanaBowmaster extends CardImpl { private static final FilterCreaturePermanent filterFlying = new FilterCreaturePermanent("creature with flying"); static { - filterElf.add(new SubtypePredicate("Elf")); + filterElf.add(new SubtypePredicate(SubType.ELF)); filterFlying.add(new AbilityPredicate(FlyingAbility.class)); } diff --git a/Mage.Sets/src/mage/cards/m/MadAuntie.java b/Mage.Sets/src/mage/cards/m/MadAuntie.java index 8ea054fcf5f..86f1ebcf05a 100644 --- a/Mage.Sets/src/mage/cards/m/MadAuntie.java +++ b/Mage.Sets/src/mage/cards/m/MadAuntie.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; @@ -55,7 +56,7 @@ public class MadAuntie extends CardImpl { private static final FilterCreaturePermanent filter1 = new FilterCreaturePermanent("another target Goblin"); static { - filter1.add(new SubtypePredicate("Goblin")); + filter1.add(new SubtypePredicate(SubType.GOBLIN)); filter1.add(new AnotherPredicate()); } diff --git a/Mage.Sets/src/mage/cards/m/MaintenanceHangar.java b/Mage.Sets/src/mage/cards/m/MaintenanceHangar.java index 3eb003db403..99cfb25ee69 100644 --- a/Mage.Sets/src/mage/cards/m/MaintenanceHangar.java +++ b/Mage.Sets/src/mage/cards/m/MaintenanceHangar.java @@ -40,13 +40,7 @@ import mage.abilities.keyword.RepairAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -62,7 +56,7 @@ public class MaintenanceHangar extends CardImpl { private static final FilterCreaturePermanent filterPermanent = new FilterCreaturePermanent("Starship creatures"); static { - filterPermanent.add(new SubtypePredicate("Starship")); + filterPermanent.add(new SubtypePredicate(SubType.STARSHIP)); } public MaintenanceHangar(UUID ownerId, CardSetInfo setInfo) { @@ -125,7 +119,7 @@ class MaintenanceHangarEffect extends ContinuousEffectImpl { private static final FilterCreatureCard filterCard = new FilterCreatureCard("Starship creatures"); static { - filterCard.add(new SubtypePredicate("Starship")); + filterCard.add(new SubtypePredicate(SubType.STARSHIP)); } public MaintenanceHangarEffect() { diff --git a/Mage.Sets/src/mage/cards/m/ManrikiGusari.java b/Mage.Sets/src/mage/cards/m/ManrikiGusari.java index 0f352cc6ac0..87b95f2992a 100644 --- a/Mage.Sets/src/mage/cards/m/ManrikiGusari.java +++ b/Mage.Sets/src/mage/cards/m/ManrikiGusari.java @@ -54,7 +54,7 @@ public class ManrikiGusari extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Equipment"); static { - filter.add(new SubtypePredicate("Equipment")); + filter.add(new SubtypePredicate(SubType.EQUIPMENT)); } public ManrikiGusari(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 cf44c63d425..eed3a665352 100644 --- a/Mage.Sets/src/mage/cards/m/MarshFlitter.java +++ b/Mage.Sets/src/mage/cards/m/MarshFlitter.java @@ -39,10 +39,7 @@ import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.GoblinRogueToken; @@ -57,7 +54,7 @@ public class MarshFlitter extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Goblin"); static { - filter.add(new SubtypePredicate("Goblin")); + filter.add(new SubtypePredicate(SubType.EQUIPMENT)); } public MarshFlitter(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 2b6f2ebfd4d..7d1db8c01eb 100644 --- a/Mage.Sets/src/mage/cards/m/MaskedGorgon.java +++ b/Mage.Sets/src/mage/cards/m/MaskedGorgon.java @@ -39,10 +39,7 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AbilityWord; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -60,7 +57,7 @@ public class MaskedGorgon extends CardImpl { static { filter1.add(Predicates.or(new ColorPredicate(ObjectColor.GREEN), new ColorPredicate(ObjectColor.WHITE))); - filter2.add(new SubtypePredicate("Gorgon")); + filter2.add(new SubtypePredicate(SubType.GORGON)); } public MaskedGorgon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MayorOfAvabruck.java b/Mage.Sets/src/mage/cards/m/MayorOfAvabruck.java index f76cbf50699..3b3be6f0903 100644 --- a/Mage.Sets/src/mage/cards/m/MayorOfAvabruck.java +++ b/Mage.Sets/src/mage/cards/m/MayorOfAvabruck.java @@ -60,7 +60,7 @@ public class MayorOfAvabruck extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Human creatures"); static { - filter.add(new SubtypePredicate("Human")); + filter.add(new SubtypePredicate(SubType.HUMAN)); } 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 0607d55c905..1a50f39391e 100644 --- a/Mage.Sets/src/mage/cards/m/MazesEnd.java +++ b/Mage.Sets/src/mage/cards/m/MazesEnd.java @@ -41,6 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -62,7 +63,7 @@ public class MazesEnd extends CardImpl { private static final FilterCard filterCard = new FilterCard("Gate card"); static { - filterCard.add(new SubtypePredicate("Gate")); + filterCard.add(new SubtypePredicate(SubType.GATE)); } public MazesEnd(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MerfolkSovereign.java b/Mage.Sets/src/mage/cards/m/MerfolkSovereign.java index 29a2a51e744..a60ab8bb45e 100644 --- a/Mage.Sets/src/mage/cards/m/MerfolkSovereign.java +++ b/Mage.Sets/src/mage/cards/m/MerfolkSovereign.java @@ -31,6 +31,7 @@ package mage.cards.m; import java.util.UUID; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; @@ -55,8 +56,8 @@ public class MerfolkSovereign extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("Merfolk creature"); static { - filter1.add(new SubtypePredicate("Merfolk")); - filter2.add(new SubtypePredicate("Merfolk")); + filter1.add(new SubtypePredicate(SubType.MERFOLK)); + filter2.add(new SubtypePredicate(SubType.MERFOLK)); } public MerfolkSovereign(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 2577683d045..d82ea1d965b 100644 --- a/Mage.Sets/src/mage/cards/m/MerrowReejerey.java +++ b/Mage.Sets/src/mage/cards/m/MerrowReejerey.java @@ -28,10 +28,8 @@ package mage.cards.m; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; + +import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -57,9 +55,9 @@ public class MerrowReejerey extends CardImpl { private static final FilterSpell filter2 = new FilterSpell("Merfolk spell"); static { - filter1.add(new SubtypePredicate("Merfolk")); + filter1.add(new SubtypePredicate(SubType.MERFOLK)); filter1.add(new ControllerPredicate(TargetController.YOU)); - filter2.add(new SubtypePredicate("Merfolk")); + filter2.add(new SubtypePredicate(SubType.MERFOLK)); } public MerrowReejerey(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MightSliver.java b/Mage.Sets/src/mage/cards/m/MightSliver.java index af8341071dc..658a4fa65e5 100644 --- a/Mage.Sets/src/mage/cards/m/MightSliver.java +++ b/Mage.Sets/src/mage/cards/m/MightSliver.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -48,7 +49,7 @@ public class MightSliver extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("All Sliver creatures"); static { - filter.add(new SubtypePredicate("Sliver")); + filter.add(new SubtypePredicate(SubType.SLIVER)); } public MightSliver(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 96b967ea803..57f28bcd80c 100644 --- a/Mage.Sets/src/mage/cards/m/MindSludge.java +++ b/Mage.Sets/src/mage/cards/m/MindSludge.java @@ -29,6 +29,7 @@ package mage.cards.m; import java.util.UUID; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.TargetController; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.discard.DiscardTargetEffect; @@ -48,7 +49,7 @@ public class MindSludge extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Swamp you control"); static { - filter.add(new SubtypePredicate("Swamp")); + filter.add(new SubtypePredicate(SubType.SWAMP)); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/m/MireKavu.java b/Mage.Sets/src/mage/cards/m/MireKavu.java index af310337c9b..b5a467db007 100644 --- a/Mage.Sets/src/mage/cards/m/MireKavu.java +++ b/Mage.Sets/src/mage/cards/m/MireKavu.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.continuous.BoostSourceWhileControlsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -47,7 +48,7 @@ public class MireKavu extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Swamp"); static { - filter.add(new SubtypePredicate("Swamp")); + filter.add(new SubtypePredicate(SubType.SWAMP)); } public MireKavu(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 c8009c85ac0..7200704ba7b 100644 --- a/Mage.Sets/src/mage/cards/m/MiresToll.java +++ b/Mage.Sets/src/mage/cards/m/MiresToll.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.discard.DiscardCardYouChooseTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -48,7 +49,7 @@ public class MiresToll extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("the number of Swamps you control"); static { - filter.add(new SubtypePredicate("Swamp")); + filter.add(new SubtypePredicate(SubType.SWAMP)); 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 2426f8c86db..223878d79a4 100644 --- a/Mage.Sets/src/mage/cards/m/MiseryCharm.java +++ b/Mage.Sets/src/mage/cards/m/MiseryCharm.java @@ -35,6 +35,7 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -52,8 +53,8 @@ public class MiseryCharm extends CardImpl { private static final FilterCard filter2 = new FilterCard("Cleric card from your graveyard"); static { - filter1.add(new SubtypePredicate("Cleric")); - filter2.add(new SubtypePredicate("Cleric")); + filter1.add(new SubtypePredicate(SubType.CLERIC)); + filter2.add(new SubtypePredicate(SubType.CLERIC)); } public MiseryCharm(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/Moonmist.java b/Mage.Sets/src/mage/cards/m/Moonmist.java index dc152574a54..cb26fca4141 100644 --- a/Mage.Sets/src/mage/cards/m/Moonmist.java +++ b/Mage.Sets/src/mage/cards/m/Moonmist.java @@ -53,7 +53,7 @@ public class Moonmist extends CardImpl { static { filter.add(Predicates.not(new SubtypePredicate(SubType.WEREWOLF))); - filter.add(Predicates.not(new SubtypePredicate("Wolf"))); + filter.add(Predicates.not(new SubtypePredicate(SubType.WOLF))); } public Moonmist(UUID ownerId, CardSetInfo setInfo) { @@ -80,7 +80,7 @@ class MoonmistEffect extends OneShotEffect { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("humans"); static { - filter.add(new SubtypePredicate("Human")); + filter.add(new SubtypePredicate(SubType.HUMAN)); } public MoonmistEffect() { diff --git a/Mage.Sets/src/mage/cards/m/MtendaGriffin.java b/Mage.Sets/src/mage/cards/m/MtendaGriffin.java index 80168318de9..a6f05aaf454 100644 --- a/Mage.Sets/src/mage/cards/m/MtendaGriffin.java +++ b/Mage.Sets/src/mage/cards/m/MtendaGriffin.java @@ -42,6 +42,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.PhaseStep; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -57,7 +58,7 @@ public class MtendaGriffin extends CardImpl { private static final FilterCard filter = new FilterCard("Griffin card from your graveyard"); static { - filter.add(new SubtypePredicate("Griffin")); + filter.add(new SubtypePredicate(SubType.GRIFFIN)); } public MtendaGriffin(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MundaAmbushLeader.java b/Mage.Sets/src/mage/cards/m/MundaAmbushLeader.java index 0a270230020..a2ce77cf128 100644 --- a/Mage.Sets/src/mage/cards/m/MundaAmbushLeader.java +++ b/Mage.Sets/src/mage/cards/m/MundaAmbushLeader.java @@ -37,10 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.Cards; import mage.cards.CardsImpl; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -85,7 +82,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("Ally")); + filter.add(new SubtypePredicate(SubType.ALLY)); } public MundaAmbushLeaderEffect() { diff --git a/Mage.Sets/src/mage/cards/m/MundasVanguard.java b/Mage.Sets/src/mage/cards/m/MundasVanguard.java index 6fdadeead0e..ebcf67ecfd9 100644 --- a/Mage.Sets/src/mage/cards/m/MundasVanguard.java +++ b/Mage.Sets/src/mage/cards/m/MundasVanguard.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; @@ -56,7 +57,7 @@ public class MundasVanguard extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("an untapped Ally you control"); static { - filter.add(new SubtypePredicate("Ally")); + filter.add(new SubtypePredicate(SubType.ALLY)); filter.add(Predicates.not(new TappedPredicate())); } diff --git a/Mage.Sets/src/mage/cards/m/MurasaPyromancer.java b/Mage.Sets/src/mage/cards/m/MurasaPyromancer.java index 49a4cf57895..e99e13d0ae3 100644 --- a/Mage.Sets/src/mage/cards/m/MurasaPyromancer.java +++ b/Mage.Sets/src/mage/cards/m/MurasaPyromancer.java @@ -37,6 +37,7 @@ import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -52,7 +53,7 @@ public class MurasaPyromancer extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Ally you control"); static { - filter.add(new SubtypePredicate("Ally")); + filter.add(new SubtypePredicate(SubType.ALLY)); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/n/NamelessOne.java b/Mage.Sets/src/mage/cards/n/NamelessOne.java index 7020f833e51..7c1d94adbfc 100644 --- a/Mage.Sets/src/mage/cards/n/NamelessOne.java +++ b/Mage.Sets/src/mage/cards/n/NamelessOne.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -51,7 +52,7 @@ public class NamelessOne extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Wizards on the battlefield"); static { - filter.add(new SubtypePredicate("Wizard")); + filter.add(new SubtypePredicate(SubType.WIZARD)); } public NamelessOne(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 f69b9ff2193..c07a21d4548 100644 --- a/Mage.Sets/src/mage/cards/n/NaturesLore.java +++ b/Mage.Sets/src/mage/cards/n/NaturesLore.java @@ -32,6 +32,7 @@ import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; 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; @@ -45,7 +46,7 @@ public class NaturesLore extends CardImpl { private static final FilterCard filter = new FilterCard("a Forest card"); static { - filter.add(new SubtypePredicate("Forest")); + filter.add(new SubtypePredicate(SubType.FOREST)); } public NaturesLore(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 009773a7939..1258b5d0db8 100644 --- a/Mage.Sets/src/mage/cards/n/NebelgastHerald.java +++ b/Mage.Sets/src/mage/cards/n/NebelgastHerald.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; @@ -55,7 +56,7 @@ public class NebelgastHerald extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - filter.add(new SubtypePredicate("Spirit")); + filter.add(new SubtypePredicate(SubType.SPIRIT)); filterTarget.add(new ControllerPredicate(TargetController.OPPONENT)); } diff --git a/Mage.Sets/src/mage/cards/n/NectarFaerie.java b/Mage.Sets/src/mage/cards/n/NectarFaerie.java index 3c0b0e3760e..c71ee8f12db 100644 --- a/Mage.Sets/src/mage/cards/n/NectarFaerie.java +++ b/Mage.Sets/src/mage/cards/n/NectarFaerie.java @@ -54,7 +54,7 @@ public class NectarFaerie extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Faerie or Elf"); static { - filter.add(Predicates.or(new SubtypePredicate("Faerie"),new SubtypePredicate("Elf"))); + filter.add(Predicates.or(new SubtypePredicate(SubType.FAERIE),new SubtypePredicate(SubType.ELF))); } public NectarFaerie(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NemataGroveGuardian.java b/Mage.Sets/src/mage/cards/n/NemataGroveGuardian.java index 124cb07626e..1be970c4263 100644 --- a/Mage.Sets/src/mage/cards/n/NemataGroveGuardian.java +++ b/Mage.Sets/src/mage/cards/n/NemataGroveGuardian.java @@ -35,10 +35,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -56,8 +53,8 @@ public class NemataGroveGuardian extends CardImpl { private static final FilterControlledPermanent filter1 = new FilterControlledPermanent("Saproling"); static { - filter.add(new SubtypePredicate("Saproling")); - filter1.add(new SubtypePredicate("Saproling")); + filter.add(new SubtypePredicate(SubType.SAPROLING)); + filter1.add(new SubtypePredicate(SubType.SAPROLING)); } 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 cdf1ee8396e..1796a1c4481 100644 --- a/Mage.Sets/src/mage/cards/n/NessianGameWarden.java +++ b/Mage.Sets/src/mage/cards/n/NessianGameWarden.java @@ -40,6 +40,7 @@ import mage.cards.Cards; import mage.cards.CardsImpl; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreatureCard; @@ -81,7 +82,7 @@ class NessianGameWardenEffect extends OneShotEffect { private static final FilterControlledPermanent filter = new FilterControlledPermanent("forests you control"); static { - filter.add(new SubtypePredicate("Forest")); + filter.add(new SubtypePredicate(SubType.FOREST)); } public NessianGameWardenEffect() { diff --git a/Mage.Sets/src/mage/cards/n/NimbusMaze.java b/Mage.Sets/src/mage/cards/n/NimbusMaze.java index 730f0137450..a5167840e4a 100644 --- a/Mage.Sets/src/mage/cards/n/NimbusMaze.java +++ b/Mage.Sets/src/mage/cards/n/NimbusMaze.java @@ -41,6 +41,7 @@ import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; @@ -56,8 +57,8 @@ public class NimbusMaze extends CardImpl { private static final FilterControlledPermanent controlPlains = new FilterControlledPermanent("you control a Plains"); static { - controlIsland.add(new SubtypePredicate("Island")); - controlPlains.add(new SubtypePredicate("Plains")); + controlIsland.add(new SubtypePredicate(SubType.ISLAND)); + controlPlains.add(new SubtypePredicate(SubType.PLAINS)); } 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 996b9ded347..66a20e22ad8 100644 --- a/Mage.Sets/src/mage/cards/n/NineRingedBo.java +++ b/Mage.Sets/src/mage/cards/n/NineRingedBo.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.ExileTargetIfDiesEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -50,7 +51,7 @@ public class NineRingedBo extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("spirit"); static { - filter.add(new SubtypePredicate("Spirit")); + filter.add(new SubtypePredicate(SubType.SPIRIT)); } public NineRingedBo(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NissaRevane.java b/Mage.Sets/src/mage/cards/n/NissaRevane.java index 5b6b874aeff..4eb53872d2c 100644 --- a/Mage.Sets/src/mage/cards/n/NissaRevane.java +++ b/Mage.Sets/src/mage/cards/n/NissaRevane.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; @@ -56,7 +57,7 @@ public class NissaRevane extends CardImpl { static { nissasChosenFilter.add(new NamePredicate("Nissa's Chosen")); - elfFilter.add(new SubtypePredicate("Elf")); + elfFilter.add(new SubtypePredicate(SubType.ELF)); } public NissaRevane(UUID ownerId, CardSetInfo setInfo) { @@ -89,7 +90,7 @@ class NissaRevaneGainLifeEffect extends OneShotEffect { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); static { - filter.add(new SubtypePredicate("Elf")); + filter.add(new SubtypePredicate(SubType.ELF)); } public NissaRevaneGainLifeEffect() { diff --git a/Mage.Sets/src/mage/cards/n/NissasPilgrimage.java b/Mage.Sets/src/mage/cards/n/NissasPilgrimage.java index 29465026729..9b6ba2b1dc5 100644 --- a/Mage.Sets/src/mage/cards/n/NissasPilgrimage.java +++ b/Mage.Sets/src/mage/cards/n/NissasPilgrimage.java @@ -39,6 +39,7 @@ import mage.cards.Cards; import mage.cards.CardsImpl; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterBasicLandCard; @@ -76,7 +77,7 @@ class NissasPilgrimageEffect extends OneShotEffect { private static final FilterCard filter = new FilterBasicLandCard("basic Forest"); static { - filter.add(new SubtypePredicate("Forest")); + filter.add(new SubtypePredicate(SubType.FOREST)); } public NissasPilgrimageEffect() { diff --git a/Mage.Sets/src/mage/cards/n/NomadMythmaker.java b/Mage.Sets/src/mage/cards/n/NomadMythmaker.java index d006803bf98..bee96d0973f 100644 --- a/Mage.Sets/src/mage/cards/n/NomadMythmaker.java +++ b/Mage.Sets/src/mage/cards/n/NomadMythmaker.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; @@ -60,7 +61,7 @@ public class NomadMythmaker extends CardImpl { static { FILTER.add(new CardTypePredicate(CardType.ENCHANTMENT)); - FILTER.add(new SubtypePredicate("Aura")); + FILTER.add(new SubtypePredicate(SubType.AURA)); } public NomadMythmaker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NoxiousGhoul.java b/Mage.Sets/src/mage/cards/n/NoxiousGhoul.java index 29ea4302ae1..06280802e7d 100644 --- a/Mage.Sets/src/mage/cards/n/NoxiousGhoul.java +++ b/Mage.Sets/src/mage/cards/n/NoxiousGhoul.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; @@ -61,11 +62,11 @@ public class NoxiousGhoul extends CardImpl { filter.add(Predicates.or( new CardIdPredicate(this.getId()), - new SubtypePredicate("Zombie"))); + new SubtypePredicate(SubType.ZOMBIE))); filter2.add(new CardTypePredicate(CardType.CREATURE)); filter2.add(Predicates.not( - new SubtypePredicate("Zombie"))); + new SubtypePredicate(SubType.ZOMBIE))); final String rule = "Whenever {this} or another Zombie enters the battlefield, all non-Zombie creatures get -1/-1 until end of turn."; diff --git a/Mage.Sets/src/mage/cards/n/Nullify.java b/Mage.Sets/src/mage/cards/n/Nullify.java index 2f0568f2f65..d41b992eca3 100644 --- a/Mage.Sets/src/mage/cards/n/Nullify.java +++ b/Mage.Sets/src/mage/cards/n/Nullify.java @@ -32,6 +32,7 @@ import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -49,7 +50,7 @@ public class Nullify extends CardImpl { static { filter.add(Predicates.or( new CardTypePredicate(CardType.CREATURE), - new SubtypePredicate("Aura"))); + new SubtypePredicate(SubType.AURA))); } 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 5a75fab7567..d429f7628fc 100644 --- a/Mage.Sets/src/mage/cards/n/NutCollector.java +++ b/Mage.Sets/src/mage/cards/n/NutCollector.java @@ -38,11 +38,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AbilityWord; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.SquirrelToken; @@ -56,7 +52,7 @@ public class NutCollector extends CardImpl { private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("squirrel"); static { - filter.add(new SubtypePredicate("Squirrel")); + filter.add(new SubtypePredicate(SubType.SQUIRREL)); } 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 b5cb61ddb0c..f15649339e3 100644 --- a/Mage.Sets/src/mage/cards/o/OathkeeperTakenosDaisho.java +++ b/Mage.Sets/src/mage/cards/o/OathkeeperTakenosDaisho.java @@ -56,7 +56,7 @@ public class OathkeeperTakenosDaisho extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("it's a Samurai card"); static { - filter.add(new SubtypePredicate("Samurai")); + filter.add(new SubtypePredicate(SubType.SAMURAI)); } public OathkeeperTakenosDaisho(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OjutaiSoulOfWinter.java b/Mage.Sets/src/mage/cards/o/OjutaiSoulOfWinter.java index 00fb9514297..fe28ec1cb5b 100644 --- a/Mage.Sets/src/mage/cards/o/OjutaiSoulOfWinter.java +++ b/Mage.Sets/src/mage/cards/o/OjutaiSoulOfWinter.java @@ -36,10 +36,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SetTargetPointer; -import mage.constants.SuperType; -import mage.constants.TargetController; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterNonlandPermanent; @@ -59,7 +56,7 @@ public class OjutaiSoulOfWinter extends CardImpl { private static final FilterPermanent filterNonlandPermanent = new FilterNonlandPermanent("nonland permanent an opponent controls"); static { - filterDragon.add(new SubtypePredicate("Dragon")); + filterDragon.add(new SubtypePredicate(SubType.DRAGON)); filterDragon.add(new ControllerPredicate(TargetController.YOU)); filterNonlandPermanent.add(new ControllerPredicate(TargetController.OPPONENT)); } diff --git a/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java b/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java index 217a8a7da10..78a5642b0da 100644 --- a/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java +++ b/Mage.Sets/src/mage/cards/o/OmnathLocusOfRage.java @@ -37,6 +37,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; @@ -54,7 +55,7 @@ public class OmnathLocusOfRage extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Elemental you control"); static { - filter.add(new SubtypePredicate("Elemental")); + filter.add(new SubtypePredicate(SubType.ELEMENTAL)); 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 197b815be6c..8a807dab0d8 100644 --- a/Mage.Sets/src/mage/cards/o/OnduCleric.java +++ b/Mage.Sets/src/mage/cards/o/OnduCleric.java @@ -36,6 +36,7 @@ import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -50,7 +51,7 @@ public class OnduCleric extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Allies you control"); static { - filter.add(new SubtypePredicate("Ally")); + filter.add(new SubtypePredicate(SubType.ALLY)); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/o/OrbitalBombardment.java b/Mage.Sets/src/mage/cards/o/OrbitalBombardment.java index 6bff720b78a..59bbebe14c2 100644 --- a/Mage.Sets/src/mage/cards/o/OrbitalBombardment.java +++ b/Mage.Sets/src/mage/cards/o/OrbitalBombardment.java @@ -32,6 +32,7 @@ import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -45,7 +46,7 @@ public class OrbitalBombardment extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Starship creatures"); static { - filter.add(Predicates.not(new SubtypePredicate("Starship"))); + filter.add(Predicates.not(new SubtypePredicate(SubType.STARSHIP))); } 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 7fc187b7ef0..3e65e5da72a 100644 --- a/Mage.Sets/src/mage/cards/o/OrcGeneral.java +++ b/Mage.Sets/src/mage/cards/o/OrcGeneral.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; @@ -56,10 +57,10 @@ public class OrcGeneral extends CardImpl { private static final FilterCreaturePermanent filterOrc = new FilterCreaturePermanent("Other Orc creatures"); static { - filterOrcOrGoblin.add(Predicates.or(new SubtypePredicate("Orc"), - new SubtypePredicate("Goblin"))); + filterOrcOrGoblin.add(Predicates.or(new SubtypePredicate(SubType.ORC), + new SubtypePredicate(SubType.GOBLIN))); filterOrcOrGoblin.add(new AnotherPredicate()); - filterOrc.add(new SubtypePredicate("Orc")); + filterOrc.add(new SubtypePredicate(SubType.ORC)); } public OrcGeneral(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 a9b2e3a467a..9325fb79e2a 100644 --- a/Mage.Sets/src/mage/cards/p/PearlspearCourier.java +++ b/Mage.Sets/src/mage/cards/p/PearlspearCourier.java @@ -43,6 +43,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -57,7 +58,7 @@ public class PearlspearCourier extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Soldier creature"); static { - filter.add(new SubtypePredicate("Soldier")); + filter.add(new SubtypePredicate(SubType.SOLDIER)); } public PearlspearCourier(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 d5d85bc2401..6d564077d61 100644 --- a/Mage.Sets/src/mage/cards/p/Peppersmoke.java +++ b/Mage.Sets/src/mage/cards/p/Peppersmoke.java @@ -38,6 +38,7 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; @@ -50,7 +51,7 @@ public class Peppersmoke extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("If you control a Faerie,"); static { - filter.add(new SubtypePredicate("Faerie")); + filter.add(new SubtypePredicate(SubType.FAERIE)); } 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 3f754a2efd3..1e032d74b0b 100644 --- a/Mage.Sets/src/mage/cards/p/PerilousForays.java +++ b/Mage.Sets/src/mage/cards/p/PerilousForays.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandCard; import mage.filter.predicate.Predicates; @@ -54,11 +55,11 @@ public class PerilousForays extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate("Plains"), - new SubtypePredicate("Island"), - new SubtypePredicate("Swamp"), - new SubtypePredicate("Forest"), - new SubtypePredicate("Mountain"))); + new SubtypePredicate(SubType.PLAINS), + new SubtypePredicate(SubType.ISLAND), + new SubtypePredicate(SubType.SWAMP), + new SubtypePredicate(SubType.FOREST), + new SubtypePredicate(SubType.MOUNTAIN))); } public PerilousForays(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 fb1ada92fb6..77a751b31cd 100644 --- a/Mage.Sets/src/mage/cards/p/PestilenceRats.java +++ b/Mage.Sets/src/mage/cards/p/PestilenceRats.java @@ -30,6 +30,7 @@ package mage.cards.p; import java.util.UUID; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; @@ -49,7 +50,7 @@ public class PestilenceRats extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other Rats on the battlefield"); static{ - filter.add(new SubtypePredicate("Rat")); + filter.add(new SubtypePredicate(SubType.RAT)); filter.add(new AnotherCardPredicate()); } diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianDriver.java b/Mage.Sets/src/mage/cards/p/PhyrexianDriver.java index 9985de53501..1ddce44f6d7 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianDriver.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianDriver.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.Duration; +import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -47,7 +48,7 @@ public class PhyrexianDriver extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Mercenary creatures"); static { - filter.add(new SubtypePredicate("Mercenary")); + filter.add(new SubtypePredicate(SubType.MERCENARY)); } 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 ff8ee1c3a87..1fb1053e095 100644 --- a/Mage.Sets/src/mage/cards/p/PietyCharm.java +++ b/Mage.Sets/src/mage/cards/p/PietyCharm.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; @@ -55,9 +56,9 @@ public class PietyCharm extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("Soldier creature"); static { - filter1.add(new SubtypePredicate("Aura")); + filter1.add(new SubtypePredicate(SubType.AURA)); filter1.add(new AttachedToPredicate(new FilterCreaturePermanent())); - filter2.add(new SubtypePredicate("Soldier")); + filter2.add(new SubtypePredicate(SubType.SOLDIER)); } public PietyCharm(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PlagueSliver.java b/Mage.Sets/src/mage/cards/p/PlagueSliver.java index f3e76656b61..1902d8d8dc3 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueSliver.java +++ b/Mage.Sets/src/mage/cards/p/PlagueSliver.java @@ -36,10 +36,7 @@ import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -52,7 +49,7 @@ public class PlagueSliver extends CardImpl { private static final FilterCreaturePermanent filterSliver = new FilterCreaturePermanent(); static { - filterSliver.add(new SubtypePredicate("Sliver")); + filterSliver.add(new SubtypePredicate(SubType.SLIVER)); } public PlagueSliver(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 4b059077cea..23fbd879ce8 100644 --- a/Mage.Sets/src/mage/cards/p/PreeminentCaptain.java +++ b/Mage.Sets/src/mage/cards/p/PreeminentCaptain.java @@ -30,6 +30,7 @@ package mage.cards.p; import java.util.UUID; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; @@ -81,7 +82,7 @@ class PreeminentCaptainEffect extends OneShotEffect { private static final FilterCreatureCard filter = new FilterCreatureCard("a soldier creature card"); static { - filter.add(new SubtypePredicate("Soldier")); + filter.add(new SubtypePredicate(SubType.SOLDIER)); } public PreeminentCaptainEffect() { diff --git a/Mage.Sets/src/mage/cards/p/PrimalBellow.java b/Mage.Sets/src/mage/cards/p/PrimalBellow.java index 47002e28cb1..eeab60d2334 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalBellow.java +++ b/Mage.Sets/src/mage/cards/p/PrimalBellow.java @@ -30,6 +30,7 @@ package mage.cards.p; import java.util.UUID; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.TargetController; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.continuous.BoostTargetEffect; @@ -49,7 +50,7 @@ public class PrimalBellow extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Forest you control"); static { - filter.add(new SubtypePredicate("Forest")); + filter.add(new SubtypePredicate(SubType.FOREST)); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/p/PrincessLeia.java b/Mage.Sets/src/mage/cards/p/PrincessLeia.java index 36ba8248d06..6e94fa25c91 100644 --- a/Mage.Sets/src/mage/cards/p/PrincessLeia.java +++ b/Mage.Sets/src/mage/cards/p/PrincessLeia.java @@ -38,10 +38,7 @@ import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -58,7 +55,7 @@ public class PrincessLeia extends CardImpl { private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("Rebel creature you control"); static { - SubtypePredicate rebel = new SubtypePredicate("Rebel"); + SubtypePredicate rebel = new SubtypePredicate(SubType.REBEL); filter1.add(new AnotherPredicate()); filter1.add(rebel); filter2.add(rebel); diff --git a/Mage.Sets/src/mage/cards/p/PsychicSpear.java b/Mage.Sets/src/mage/cards/p/PsychicSpear.java index f8c9a82c61d..f3763e73e8c 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicSpear.java +++ b/Mage.Sets/src/mage/cards/p/PsychicSpear.java @@ -33,6 +33,7 @@ import mage.constants.CardType; import mage.abilities.effects.common.discard.DiscardCardYouChooseTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; @@ -48,7 +49,7 @@ public 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("Spirit"),new SubtypePredicate("Arcane"))); + filter.add(Predicates.or(new SubtypePredicate(SubType.SPIRIT),new SubtypePredicate(SubType.ARCANE))); } public PsychicSpear(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 04cd66fd27c..9082f0837d3 100644 --- a/Mage.Sets/src/mage/cards/p/Pulverize.java +++ b/Mage.Sets/src/mage/cards/p/Pulverize.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterArtifactPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -47,7 +48,7 @@ public class Pulverize extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("two Mountains"); static { - filter.add(new SubtypePredicate("Mountain")); + filter.add(new SubtypePredicate(SubType.MOUNTAIN)); } public Pulverize(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PuresteelPaladin.java b/Mage.Sets/src/mage/cards/p/PuresteelPaladin.java index d5d2a062ae6..f5b05431f4d 100644 --- a/Mage.Sets/src/mage/cards/p/PuresteelPaladin.java +++ b/Mage.Sets/src/mage/cards/p/PuresteelPaladin.java @@ -29,10 +29,8 @@ package mage.cards.p; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; + +import mage.constants.*; import mage.MageInt; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -55,7 +53,7 @@ public class PuresteelPaladin extends CardImpl { private static final FilterPermanent filter = new FilterControlledPermanent("Equipment"); static { - filter.add(new SubtypePredicate("Equipment")); + filter.add(new SubtypePredicate(SubType.EQUIPMENT)); } public PuresteelPaladin(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/q/QasaliAmbusher.java b/Mage.Sets/src/mage/cards/q/QasaliAmbusher.java index a229767c968..df04017d726 100644 --- a/Mage.Sets/src/mage/cards/q/QasaliAmbusher.java +++ b/Mage.Sets/src/mage/cards/q/QasaliAmbusher.java @@ -38,10 +38,7 @@ import mage.abilities.keyword.ReachAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TimingRule; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -85,8 +82,8 @@ class QasaliAmbusherAbility extends ActivatedAbilityImpl { private static final FilterControlledLandPermanent filterForest = new FilterControlledLandPermanent(); static { - filterPlains.add(new SubtypePredicate("Plains")); - filterForest.add(new SubtypePredicate("Forest")); + filterPlains.add(new SubtypePredicate(SubType.PLAINS)); + filterForest.add(new SubtypePredicate(SubType.FOREST)); } public QasaliAmbusherAbility() { diff --git a/Mage.Sets/src/mage/cards/q/QuagSickness.java b/Mage.Sets/src/mage/cards/q/QuagSickness.java index d672a2c6d86..bd9359b9f85 100644 --- a/Mage.Sets/src/mage/cards/q/QuagSickness.java +++ b/Mage.Sets/src/mage/cards/q/QuagSickness.java @@ -29,11 +29,8 @@ package mage.cards.q; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; + +import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.AttachEffect; @@ -56,7 +53,7 @@ public class QuagSickness extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Swamp you control"); static { - filter.add(new SubtypePredicate("Swamp")); + filter.add(new SubtypePredicate(SubType.SWAMP)); 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 5f7ef722a77..a6b525584e9 100644 --- a/Mage.Sets/src/mage/cards/q/QuestForTheGoblinLord.java +++ b/Mage.Sets/src/mage/cards/q/QuestForTheGoblinLord.java @@ -36,10 +36,7 @@ import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; @@ -59,7 +56,7 @@ public class QuestForTheGoblinLord extends CardImpl { static { filter.add(new ControllerPredicate(TargetController.YOU)); - goblinFilter.add(new SubtypePredicate("Goblin")); + goblinFilter.add(new SubtypePredicate(SubType.GOBLIN)); } 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 ce3d7dd9a9b..adaedb23bc1 100644 --- a/Mage.Sets/src/mage/cards/q/QuestForTheHolyRelic.java +++ b/Mage.Sets/src/mage/cards/q/QuestForTheHolyRelic.java @@ -40,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.FilterCard; @@ -103,7 +104,7 @@ class QuestForTheHolyRelicEffect extends OneShotEffect { } FilterCard filter = new FilterCard("Equipment"); - filter.add(new SubtypePredicate("Equipment")); + filter.add(new SubtypePredicate(SubType.EQUIPMENT)); TargetCardInLibrary target = new TargetCardInLibrary(filter); if (controller.searchLibrary(target, 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 96eb11c5488..3d0a9b608e9 100644 --- a/Mage.Sets/src/mage/cards/q/QuestForUlasTemple.java +++ b/Mage.Sets/src/mage/cards/q/QuestForUlasTemple.java @@ -37,10 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.Cards; import mage.cards.CardsImpl; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.Predicates; @@ -156,10 +153,10 @@ class QuestForUlasTempleEffect2 extends OneShotEffect { static { filter.add(Predicates.or( - new SubtypePredicate("Kraken"), - new SubtypePredicate("Leviathan"), - new SubtypePredicate("Octopus"), - new SubtypePredicate("Serpent"))); + new SubtypePredicate(SubType.KRAKEN), + new SubtypePredicate(SubType.LEVIATHAN), + new SubtypePredicate(SubType.OCTOPUS), + new SubtypePredicate(SubType.SERPENT))); } QuestForUlasTempleEffect2() { diff --git a/Mage.Sets/src/mage/cards/q/QuickSliver.java b/Mage.Sets/src/mage/cards/q/QuickSliver.java index a8c50c6e546..3fe1fe505c3 100644 --- a/Mage.Sets/src/mage/cards/q/QuickSliver.java +++ b/Mage.Sets/src/mage/cards/q/QuickSliver.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -48,7 +49,7 @@ public class QuickSliver extends CardImpl { private static final FilterCreatureCard filter = new FilterCreatureCard("Sliver cards"); static { - filter.add(new SubtypePredicate("Sliver")); + filter.add(new SubtypePredicate(SubType.SLIVER)); } public QuickSliver(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 e12a71153cf..d8d332b4ded 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosTheDefiler.java +++ b/Mage.Sets/src/mage/cards/r/RakdosTheDefiler.java @@ -43,6 +43,7 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; @@ -59,8 +60,8 @@ public class RakdosTheDefiler extends CardImpl { private static final FilterPermanent damageToPlayerTriggerFilter = new FilterPermanent("the non-Demon permanents you control"); static { - attackTriggerFilter.add(Predicates.not(new SubtypePredicate("Demon"))); - damageToPlayerTriggerFilter.add(Predicates.not(new SubtypePredicate("Demon"))); + attackTriggerFilter.add(Predicates.not(new SubtypePredicate(SubType.DEMON))); + damageToPlayerTriggerFilter.add(Predicates.not(new SubtypePredicate(SubType.DEMON))); } public RakdosTheDefiler(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 c8a2b52d296..d202a84d8a3 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianCaptain.java +++ b/Mage.Sets/src/mage/cards/r/RamosianCaptain.java @@ -39,6 +39,7 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; @@ -56,7 +57,7 @@ public 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("Rebel")); + filter.add(new SubtypePredicate(SubType.REBEL)); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 5)); } diff --git a/Mage.Sets/src/mage/cards/r/RamosianRally.java b/Mage.Sets/src/mage/cards/r/RamosianRally.java index 366fe38c313..9f065419987 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianRally.java +++ b/Mage.Sets/src/mage/cards/r/RamosianRally.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; @@ -54,7 +55,7 @@ public class RamosianRally extends CardImpl { private static final FilterControlledCreaturePermanent creatureFilter = new FilterControlledCreaturePermanent("an untapped creature you control"); static { - plainsFilter.add(new SubtypePredicate("Plains")); + plainsFilter.add(new SubtypePredicate(SubType.PLAINS)); creatureFilter.add(Predicates.not(new TappedPredicate())); } diff --git a/Mage.Sets/src/mage/cards/r/RamosianSergeant.java b/Mage.Sets/src/mage/cards/r/RamosianSergeant.java index 38110eeb6a3..62a28e9956d 100644 --- a/Mage.Sets/src/mage/cards/r/RamosianSergeant.java +++ b/Mage.Sets/src/mage/cards/r/RamosianSergeant.java @@ -38,6 +38,7 @@ import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; @@ -47,7 +48,6 @@ import mage.target.common.TargetCardInLibrary; import java.util.UUID; /** - * * @author Backfir3 */ public class RamosianSergeant extends CardImpl { @@ -55,12 +55,12 @@ public 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("Rebel")); - filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); + filter.add(new SubtypePredicate(SubType.REBEL)); + filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3)); } public RamosianSergeant(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{W}"); this.subtype.add("Human"); this.subtype.add("Rebel"); diff --git a/Mage.Sets/src/mage/cards/r/RangersPath.java b/Mage.Sets/src/mage/cards/r/RangersPath.java index 86d67360d1d..74168dca2d4 100644 --- a/Mage.Sets/src/mage/cards/r/RangersPath.java +++ b/Mage.Sets/src/mage/cards/r/RangersPath.java @@ -32,6 +32,7 @@ import mage.constants.CardType; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SubType; import mage.filter.common.FilterLandCard; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCardInLibrary; @@ -45,7 +46,7 @@ public class RangersPath extends CardImpl { private static final FilterLandCard filter = new FilterLandCard("Forest cards"); static { - filter.add(new SubtypePredicate("Forest")); + filter.add(new SubtypePredicate(SubType.FOREST)); } public RangersPath(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RathiIntimidator.java b/Mage.Sets/src/mage/cards/r/RathiIntimidator.java index 18ab0f804e7..2b3f1b9519b 100644 --- a/Mage.Sets/src/mage/cards/r/RathiIntimidator.java +++ b/Mage.Sets/src/mage/cards/r/RathiIntimidator.java @@ -38,6 +38,7 @@ import mage.abilities.keyword.FearAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; @@ -55,7 +56,7 @@ public 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("Mercenary")); + filter.add(new SubtypePredicate(SubType.MERCENARY)); 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 f9079b6f330..226563116af 100644 --- a/Mage.Sets/src/mage/cards/r/Rattlechains.java +++ b/Mage.Sets/src/mage/cards/r/Rattlechains.java @@ -41,6 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; @@ -57,8 +58,8 @@ public class Rattlechains extends CardImpl { private static final FilterCard filterCard = new FilterCard("Spirit spells"); static { - filter.add(new SubtypePredicate("Spirit")); - filterCard.add(new SubtypePredicate("Spirit")); + filter.add(new SubtypePredicate(SubType.SPIRIT)); + filterCard.add(new SubtypePredicate(SubType.SPIRIT)); } public Rattlechains(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 52b8500b2b7..209a2955fb4 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessCohort.java +++ b/Mage.Sets/src/mage/cards/r/RecklessCohort.java @@ -29,7 +29,7 @@ package mage.cards.r; import java.util.UUID; import mage.MageInt; -import mage.constants.ComparisonType; +import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalRequirementEffect; @@ -37,9 +37,6 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.common.combat.AttacksIfAbleSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; @@ -54,7 +51,7 @@ public class RecklessCohort extends CardImpl { static { filter.add(new AnotherPredicate()); - filter.add(new SubtypePredicate("Ally")); + filter.add(new SubtypePredicate(SubType.ALLY)); } public RecklessCohort(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RelentlessDead.java b/Mage.Sets/src/mage/cards/r/RelentlessDead.java index a8c19b851c0..06abcdef87a 100644 --- a/Mage.Sets/src/mage/cards/r/RelentlessDead.java +++ b/Mage.Sets/src/mage/cards/r/RelentlessDead.java @@ -29,7 +29,7 @@ package mage.cards.r; import mage.MageInt; import mage.abilities.Ability; -import mage.constants.ComparisonType; +import mage.constants.*; import mage.abilities.common.DiesTriggeredAbility; import mage.abilities.costs.Cost; import mage.abilities.costs.mana.GenericManaCost; @@ -41,9 +41,6 @@ import mage.abilities.keyword.MenaceAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.AnotherCardPredicate; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; @@ -111,7 +108,7 @@ class RelentlessDeadEffect extends OneShotEffect { Cost cost = new GenericManaCost(costX); if (cost.pay(source, game, source.getSourceId(), source.getControllerId(), false, null)) { FilterCard filter = new FilterCard("Another target Zombie card with converted mana cost " + costX); - filter.add(new SubtypePredicate("Zombie")); + filter.add(new SubtypePredicate(SubType.ZOMBIE)); filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, costX)); filter.add(new AnotherCardPredicate()); TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(filter); diff --git a/Mage.Sets/src/mage/cards/r/RenewingDawn.java b/Mage.Sets/src/mage/cards/r/RenewingDawn.java index 56fd4dd0d30..d82e305ce7d 100644 --- a/Mage.Sets/src/mage/cards/r/RenewingDawn.java +++ b/Mage.Sets/src/mage/cards/r/RenewingDawn.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; 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; @@ -49,7 +50,7 @@ public class RenewingDawn extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Mountain"); static { - filter.add(new SubtypePredicate("Mountain")); + filter.add(new SubtypePredicate(SubType.MOUNTAIN)); } public RenewingDawn(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 cd5b8715144..4bee85c2f1c 100644 --- a/Mage.Sets/src/mage/cards/r/ReverentSilence.java +++ b/Mage.Sets/src/mage/cards/r/ReverentSilence.java @@ -35,6 +35,7 @@ import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -48,7 +49,7 @@ public class ReverentSilence extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("If you control a Forest"); static { - filter.add(new SubtypePredicate("Forest")); + filter.add(new SubtypePredicate(SubType.FOREST)); } public ReverentSilence(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RimeDryad.java b/Mage.Sets/src/mage/cards/r/RimeDryad.java index 17f06a52f4b..6513f0c2224 100644 --- a/Mage.Sets/src/mage/cards/r/RimeDryad.java +++ b/Mage.Sets/src/mage/cards/r/RimeDryad.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.LandwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -49,7 +50,7 @@ public class RimeDryad extends CardImpl { static { filter.add(new SupertypePredicate(SuperType.SNOW)); - filter.add(new SubtypePredicate("Forest")); + filter.add(new SubtypePredicate(SubType.FOREST)); } public RimeDryad(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RiotRingleader.java b/Mage.Sets/src/mage/cards/r/RiotRingleader.java index 60a2f85de7a..295d7126f49 100644 --- a/Mage.Sets/src/mage/cards/r/RiotRingleader.java +++ b/Mage.Sets/src/mage/cards/r/RiotRingleader.java @@ -35,6 +35,7 @@ import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -47,7 +48,7 @@ public class RiotRingleader extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Human creatures"); static { - filter.add(new SubtypePredicate("Human")); + filter.add(new SubtypePredicate(SubType.HUMAN)); } public RiotRingleader(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 9f62015fc3f..91f62aadc06 100644 --- a/Mage.Sets/src/mage/cards/r/RithsGrove.java +++ b/Mage.Sets/src/mage/cards/r/RithsGrove.java @@ -37,6 +37,7 @@ import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -50,7 +51,7 @@ public class RithsGrove extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("non-Lair land"); static{ - filter.add(Predicates.not(new SubtypePredicate("Lair"))); + filter.add(Predicates.not(new SubtypePredicate(SubType.LAIR))); } public RithsGrove(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 4417f49fc40..1264d062407 100644 --- a/Mage.Sets/src/mage/cards/r/RooftopStorm.java +++ b/Mage.Sets/src/mage/cards/r/RooftopStorm.java @@ -72,7 +72,7 @@ class RooftopStormRuleEffect extends ContinuousEffectImpl { private static final FilterCard filter = new FilterCard("Zombie creature spells"); static { - filter.add(new SubtypePredicate("Zombie")); + filter.add(new SubtypePredicate(SubType.ZOMBIE)); filter.add(new CardTypePredicate(CardType.CREATURE)); } diff --git a/Mage.Sets/src/mage/cards/r/RootCage.java b/Mage.Sets/src/mage/cards/r/RootCage.java index 5cce6a97f4e..fdf4c56229c 100644 --- a/Mage.Sets/src/mage/cards/r/RootCage.java +++ b/Mage.Sets/src/mage/cards/r/RootCage.java @@ -32,10 +32,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.DontUntapInControllersUntapStepAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -48,7 +45,7 @@ public class RootCage extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Mercenaries"); static { - filter.add(new SubtypePredicate("Mercenary")); + filter.add(new SubtypePredicate(SubType.MERCENARY)); } public RootCage(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 cc97ec35d37..93eea3332bb 100644 --- a/Mage.Sets/src/mage/cards/r/RusticClachan.java +++ b/Mage.Sets/src/mage/cards/r/RusticClachan.java @@ -37,6 +37,7 @@ import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; 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; @@ -50,7 +51,7 @@ public class RusticClachan extends CardImpl { private static final FilterCard filter = new FilterCard("a Kithkin card from your hand"); static { - filter.add(new SubtypePredicate("Kithkin")); + filter.add(new SubtypePredicate(SubType.KITHKIN)); } public RusticClachan(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 c516fed282b..6002c3f3264 100644 --- a/Mage.Sets/src/mage/cards/s/SagesDousing.java +++ b/Mage.Sets/src/mage/cards/s/SagesDousing.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; 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; @@ -49,7 +50,7 @@ public class SagesDousing extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Wizard"); static { - filter.add(new SubtypePredicate("Wizard")); + filter.add(new SubtypePredicate(SubType.WIZARD)); } public SagesDousing(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 70973530cf7..ac08560d8aa 100644 --- a/Mage.Sets/src/mage/cards/s/SaruliGatekeepers.java +++ b/Mage.Sets/src/mage/cards/s/SaruliGatekeepers.java @@ -39,6 +39,7 @@ import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -52,7 +53,7 @@ public class SaruliGatekeepers extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent(); static { - filter.add(new SubtypePredicate("Gate")); + filter.add(new SubtypePredicate(SubType.GATE)); } public SaruliGatekeepers (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 2bb552105a3..4f587031692 100644 --- a/Mage.Sets/src/mage/cards/s/Scald.java +++ b/Mage.Sets/src/mage/cards/s/Scald.java @@ -34,6 +34,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SetTargetPointer; +import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -46,7 +47,7 @@ public class Scald extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("a player taps an Island"); static { - filter.add(new SubtypePredicate("Island")); + filter.add(new SubtypePredicate(SubType.ISLAND)); } 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 83edeed9c9a..60b1d432a86 100644 --- a/Mage.Sets/src/mage/cards/s/ScaleguardSentinels.java +++ b/Mage.Sets/src/mage/cards/s/ScaleguardSentinels.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AbilityType; import mage.constants.CardType; +import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -57,7 +58,7 @@ public 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("Dragon")); + filter.add(new SubtypePredicate(SubType.DRAGON)); } public ScaleguardSentinels(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 30832ae7f7c..64b7d2f2f43 100644 --- a/Mage.Sets/src/mage/cards/s/Scarecrone.java +++ b/Mage.Sets/src/mage/cards/s/Scarecrone.java @@ -39,6 +39,7 @@ import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffec import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; @@ -57,7 +58,7 @@ public class Scarecrone extends CardImpl { static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); filter.add(new CardTypePredicate(CardType.CREATURE)); - filterScarecrow.add(new SubtypePredicate("Scarecrow")); + filterScarecrow.add(new SubtypePredicate(SubType.SCARECROW)); } public Scarecrone(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 c33b3b5b4c0..ff62c137aac 100644 --- a/Mage.Sets/src/mage/cards/s/ScionOfOona.java +++ b/Mage.Sets/src/mage/cards/s/ScionOfOona.java @@ -28,10 +28,8 @@ package mage.cards.s; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; + +import mage.constants.*; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.BoostControlledEffect; @@ -56,9 +54,9 @@ public class ScionOfOona extends CardImpl { private static final FilterCreaturePermanent filterCreature = new FilterCreaturePermanent("Faeries"); static { - filter.add(new SubtypePredicate("Faerie")); + filter.add(new SubtypePredicate(SubType.FAERIE)); filter.add(new ControllerPredicate(TargetController.YOU)); - filterCreature.add(new SubtypePredicate("Faerie")); + filterCreature.add(new SubtypePredicate(SubType.FAERIE)); filterCreature.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/s/ScourgeOfFleets.java b/Mage.Sets/src/mage/cards/s/ScourgeOfFleets.java index 5c405517c11..291eafaecba 100644 --- a/Mage.Sets/src/mage/cards/s/ScourgeOfFleets.java +++ b/Mage.Sets/src/mage/cards/s/ScourgeOfFleets.java @@ -29,17 +29,13 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.Ability; -import mage.constants.ComparisonType; +import mage.constants.*; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.Cards; import mage.cards.CardsImpl; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterCreaturePermanent; @@ -84,7 +80,7 @@ class ScourgeOfFleetsEffect extends OneShotEffect { private static final FilterControlledPermanent filter = new FilterControlledPermanent("number of Islands you control"); static { - filter.add(new SubtypePredicate("Island")); + filter.add(new SubtypePredicate(SubType.ISLAND)); } public ScourgeOfFleetsEffect() { diff --git a/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java b/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java index bf3811a2ca7..b178e34ba91 100644 --- a/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java +++ b/Mage.Sets/src/mage/cards/s/ScourgeOfValkas.java @@ -42,6 +42,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; @@ -58,8 +59,8 @@ public class ScourgeOfValkas extends CardImpl { private final static FilterControlledCreaturePermanent filter2 = new FilterControlledCreaturePermanent("Dragons you control"); static { - filter.add(new SubtypePredicate("Dragon")); - filter2.add(new SubtypePredicate("Dragon")); + filter.add(new SubtypePredicate(SubType.DRAGON)); + filter2.add(new SubtypePredicate(SubType.DRAGON)); } private static final String rule = "Whenever {this} or another Dragon enters the battlefield under your control, it deals X damage to target creature or player, where X is the number of Dragons you control."; diff --git a/Mage.Sets/src/mage/cards/s/ScoutTrooper.java b/Mage.Sets/src/mage/cards/s/ScoutTrooper.java index e61da9247c7..83449ce21ed 100644 --- a/Mage.Sets/src/mage/cards/s/ScoutTrooper.java +++ b/Mage.Sets/src/mage/cards/s/ScoutTrooper.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -48,7 +49,7 @@ public class ScoutTrooper extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Trooper creatures"); static { - filter.add(new SubtypePredicate("Trooper")); + filter.add(new SubtypePredicate(SubType.TROOPER)); } public ScoutTrooper(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 33858e7235a..3e6d939b033 100644 --- a/Mage.Sets/src/mage/cards/s/SeaGateLoremaster.java +++ b/Mage.Sets/src/mage/cards/s/SeaGateLoremaster.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -49,7 +50,7 @@ public class SeaGateLoremaster extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Ally you control"); static { - filter.add(new SubtypePredicate("Ally")); + filter.add(new SubtypePredicate(SubType.ALLY)); } public SeaGateLoremaster(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 69bf2ac1562..dae88ae72f3 100644 --- a/Mage.Sets/src/mage/cards/s/SelkieHedgeMage.java +++ b/Mage.Sets/src/mage/cards/s/SelkieHedgeMage.java @@ -28,6 +28,7 @@ package mage.cards.s; import java.util.UUID; + import mage.MageInt; import mage.abilities.Ability; import mage.constants.ComparisonType; @@ -39,6 +40,7 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -46,9 +48,7 @@ import mage.filter.predicate.permanent.TappedPredicate; import mage.target.TargetPermanent; /** - * * @author jeffwadsworth - * */ public class SelkieHedgeMage extends CardImpl { @@ -57,8 +57,8 @@ public class SelkieHedgeMage extends CardImpl { private static final FilterCreaturePermanent filter3 = new FilterCreaturePermanent("tapped creature"); static { - filter.add(new SubtypePredicate("Forest")); - filter2.add(new SubtypePredicate("Island")); + filter.add(new SubtypePredicate(SubType.FOREST)); + filter2.add(new SubtypePredicate(SubType.ISLAND)); filter3.add(new TappedPredicate()); } @@ -66,7 +66,7 @@ public class SelkieHedgeMage extends CardImpl { private static final String rule2 = "When {this} enters the battlefield, if you control two or more Islands, you may return target tapped creature to its owner's hand."; public SelkieHedgeMage(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G/U}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G/U}"); this.subtype.add("Merfolk"); this.subtype.add("Wizard"); diff --git a/Mage.Sets/src/mage/cards/s/SereneHeart.java b/Mage.Sets/src/mage/cards/s/SereneHeart.java index 6c5cbeb3748..5a9e8a3bdff 100644 --- a/Mage.Sets/src/mage/cards/s/SereneHeart.java +++ b/Mage.Sets/src/mage/cards/s/SereneHeart.java @@ -32,6 +32,7 @@ import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -44,7 +45,7 @@ public class SereneHeart extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Auras"); static { - filter.add(new SubtypePredicate("Aura")); + filter.add(new SubtypePredicate(SubType.AURA)); } public SereneHeart(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 cb2335169db..3118ce9f751 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowTrooper.java +++ b/Mage.Sets/src/mage/cards/s/ShadowTrooper.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -49,7 +50,7 @@ public class ShadowTrooper extends CardImpl { private static final FilterCreatureCard filter = new FilterCreatureCard("Trooper creatures"); static { - filter.add(new SubtypePredicate("Trooper")); + filter.add(new SubtypePredicate(SubType.TROOPER)); } public ShadowTrooper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/Shapesharer.java b/Mage.Sets/src/mage/cards/s/Shapesharer.java index c286937ab42..7e67415fec0 100644 --- a/Mage.Sets/src/mage/cards/s/Shapesharer.java +++ b/Mage.Sets/src/mage/cards/s/Shapesharer.java @@ -36,10 +36,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.ChangelingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -56,7 +53,7 @@ public class Shapesharer extends CardImpl { private static final FilterPermanent filterShapeshifter = new FilterPermanent("Shapeshifter"); static { - filterShapeshifter.add(new SubtypePredicate("Shapeshifter")); + filterShapeshifter.add(new SubtypePredicate(SubType.SHAPESHIFTER)); } public Shapesharer(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 862cdcb19ba..fe72c6237f7 100644 --- a/Mage.Sets/src/mage/cards/s/ShepherdOfRot.java +++ b/Mage.Sets/src/mage/cards/s/ShepherdOfRot.java @@ -37,6 +37,7 @@ import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.LoseLifeAllPlayersEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -52,7 +53,7 @@ public class ShepherdOfRot extends CardImpl { static final private FilterPermanent filter = new FilterPermanent("Zombie"); static { - filter.add(new SubtypePredicate("Zombie")); + filter.add(new SubtypePredicate(SubType.ZOMBIE)); } public ShepherdOfRot(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 e039265b393..977f398577b 100644 --- a/Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java +++ b/Mage.Sets/src/mage/cards/s/SigardaHeronsGrace.java @@ -41,10 +41,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.HumanSoldierToken; @@ -61,7 +58,7 @@ public class SigardaHeronsGrace extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Humans you control"); static { - filter.add(new SubtypePredicate("Human")); + filter.add(new SubtypePredicate(SubType.HUMAN)); } public SigardaHeronsGrace(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 f608bfc2e56..703b397f5a4 100644 --- a/Mage.Sets/src/mage/cards/s/SilumgarTheDriftingDeath.java +++ b/Mage.Sets/src/mage/cards/s/SilumgarTheDriftingDeath.java @@ -55,7 +55,7 @@ public class SilumgarTheDriftingDeath extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Dragon you control"); static { - filter.add(new SubtypePredicate("Dragon")); + filter.add(new SubtypePredicate(SubType.DRAGON)); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/s/SimaYiWeiFieldMarshal.java b/Mage.Sets/src/mage/cards/s/SimaYiWeiFieldMarshal.java index 97306898f65..d23d78c97b9 100644 --- a/Mage.Sets/src/mage/cards/s/SimaYiWeiFieldMarshal.java +++ b/Mage.Sets/src/mage/cards/s/SimaYiWeiFieldMarshal.java @@ -33,10 +33,7 @@ import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.continuous.SetPowerSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -51,7 +48,7 @@ public class SimaYiWeiFieldMarshal extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Swamps you control"); static{ - filter.add(new SubtypePredicate("Swamp")); + filter.add(new SubtypePredicate(SubType.SWAMP)); } 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 49a4a52627d..00f3f23567c 100644 --- a/Mage.Sets/src/mage/cards/s/SimicGuildmage.java +++ b/Mage.Sets/src/mage/cards/s/SimicGuildmage.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.Filter; @@ -67,7 +68,7 @@ public class SimicGuildmage extends CardImpl { private static final FilterEnchantmentPermanent auraFilter = new FilterEnchantmentPermanent("Aura"); static { - auraFilter.add(new SubtypePredicate("Aura")); + auraFilter.add(new SubtypePredicate(SubType.AURA)); } public SimicGuildmage(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 2f5fd9a4765..13411ef64c4 100644 --- a/Mage.Sets/src/mage/cards/s/SkirkOutrider.java +++ b/Mage.Sets/src/mage/cards/s/SkirkOutrider.java @@ -40,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; 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; @@ -53,7 +54,7 @@ public class SkirkOutrider extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Beast"); static { - filter.add(new SubtypePredicate("Beast")); + filter.add(new SubtypePredicate(SubType.BEAST)); } public SkirkOutrider(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 712a053cdb2..bc82a244eae 100644 --- a/Mage.Sets/src/mage/cards/s/SliverOverlord.java +++ b/Mage.Sets/src/mage/cards/s/SliverOverlord.java @@ -54,7 +54,7 @@ public class SliverOverlord extends CardImpl { private static final FilterCard filter = new FilterCard("Sliver card"); static{ - filter.add(new SubtypePredicate("Sliver")); + filter.add(new SubtypePredicate(SubType.SLIVER)); } public SliverOverlord(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 c4c8b0279c0..e646f505b13 100644 --- a/Mage.Sets/src/mage/cards/s/SosukeSonOfSeshiro.java +++ b/Mage.Sets/src/mage/cards/s/SosukeSonOfSeshiro.java @@ -37,10 +37,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; @@ -61,7 +58,7 @@ public class SosukeSonOfSeshiro extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Snake creatures"); static { - filter.add(new SubtypePredicate("Snake")); + filter.add(new SubtypePredicate(SubType.SNAKE)); } 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 d1b2b5b89fc..a876029f049 100644 --- a/Mage.Sets/src/mage/cards/s/SosukesSummons.java +++ b/Mage.Sets/src/mage/cards/s/SosukesSummons.java @@ -29,6 +29,7 @@ package mage.cards.s; import java.util.UUID; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.abilities.common.CreatureEntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -50,7 +51,7 @@ public class SosukesSummons extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken Snake"); static { - filter.add(new SubtypePredicate("Snake")); + filter.add(new SubtypePredicate(SubType.SNAKE)); filter.add(Predicates.not(new TokenPredicate())); } diff --git a/Mage.Sets/src/mage/cards/s/SpawnbinderMage.java b/Mage.Sets/src/mage/cards/s/SpawnbinderMage.java index ba8d803150f..c4a9bee98c3 100644 --- a/Mage.Sets/src/mage/cards/s/SpawnbinderMage.java +++ b/Mage.Sets/src/mage/cards/s/SpawnbinderMage.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; @@ -55,7 +56,7 @@ public class SpawnbinderMage extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("an untapped Ally you control"); static { - filter.add(new SubtypePredicate("Ally")); + filter.add(new SubtypePredicate(SubType.ALLY)); filter.add(Predicates.not(new TappedPredicate())); } diff --git a/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java b/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java index f13314ef6f1..0896027eae6 100644 --- a/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java +++ b/Mage.Sets/src/mage/cards/s/SpawnsireOfUlamog.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.AnnihilatorAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -53,7 +54,7 @@ public class SpawnsireOfUlamog extends CardImpl { private static final FilterCard filter = new FilterCard("Eldrazi cards"); static { - filter.add(new SubtypePredicate("Eldrazi")); + filter.add(new SubtypePredicate(SubType.ELDRAZI)); } public SpawnsireOfUlamog(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 b05946fb88a..0f429752cd1 100644 --- a/Mage.Sets/src/mage/cards/s/SpeederTrooper.java +++ b/Mage.Sets/src/mage/cards/s/SpeederTrooper.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -49,7 +50,7 @@ public class SpeederTrooper extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Trooper creatures"); static { - filter.add(new SubtypePredicate("Trooper")); + filter.add(new SubtypePredicate(SubType.TROOPER)); } public SpeederTrooper(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpiritMirror.java b/Mage.Sets/src/mage/cards/s/SpiritMirror.java index 017f0565a8d..dca44a9f449 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritMirror.java +++ b/Mage.Sets/src/mage/cards/s/SpiritMirror.java @@ -38,10 +38,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ComparisonType; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -57,7 +54,7 @@ public class SpiritMirror extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("Reflection"); static { - filter.add(new SubtypePredicate("Reflection")); + filter.add(new SubtypePredicate(SubType.REFLECTION)); } public SpiritMirror(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpittingSliver.java b/Mage.Sets/src/mage/cards/s/SpittingSliver.java index d2242e2c424..4991ab4abcb 100644 --- a/Mage.Sets/src/mage/cards/s/SpittingSliver.java +++ b/Mage.Sets/src/mage/cards/s/SpittingSliver.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -49,7 +50,7 @@ public class SpittingSliver extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("All Sliver creatures"); static { - filter.add(new SubtypePredicate("Sliver")); + filter.add(new SubtypePredicate(SubType.SLIVER)); } public SpittingSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SpurredWolverine.java b/Mage.Sets/src/mage/cards/s/SpurredWolverine.java index f98f8ee1214..b952bd9ba8d 100644 --- a/Mage.Sets/src/mage/cards/s/SpurredWolverine.java +++ b/Mage.Sets/src/mage/cards/s/SpurredWolverine.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; 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.Predicates; @@ -56,7 +57,7 @@ public class SpurredWolverine extends CardImpl { static { filter.add(Predicates.not(new TappedPredicate())); - filter.add(new SubtypePredicate("Beast")); + filter.add(new SubtypePredicate(SubType.BEAST)); } public SpurredWolverine(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SquelchingLeeches.java b/Mage.Sets/src/mage/cards/s/SquelchingLeeches.java index 7636232470e..8a75973202b 100644 --- a/Mage.Sets/src/mage/cards/s/SquelchingLeeches.java +++ b/Mage.Sets/src/mage/cards/s/SquelchingLeeches.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; 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; @@ -49,7 +50,7 @@ public class SquelchingLeeches extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Swamps you control"); static { - filter.add(new SubtypePredicate("Swamp")); + filter.add(new SubtypePredicate(SubType.SWAMP)); } public SquelchingLeeches(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SquirrelMob.java b/Mage.Sets/src/mage/cards/s/SquirrelMob.java index 584804b0534..7cee6def596 100644 --- a/Mage.Sets/src/mage/cards/s/SquirrelMob.java +++ b/Mage.Sets/src/mage/cards/s/SquirrelMob.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -59,7 +60,7 @@ public class SquirrelMob extends CardImpl { // Squirrel Mob gets +1/+1 for each other Squirrel on the battlefield. FilterCreaturePermanent filter = new FilterCreaturePermanent("other Squirrel"); - filter.add(new SubtypePredicate("Squirrel")); + filter.add(new SubtypePredicate(SubType.SQUIRREL)); filter.add(Predicates.not(new PermanentIdPredicate(this.getId()))); DynamicValue xValue = new PermanentsOnBattlefieldCount(filter); Effect effect = new BoostSourceEffect(xValue, xValue, Duration.WhileOnBattlefield, false); diff --git a/Mage.Sets/src/mage/cards/s/StaffOfTheMindMagus.java b/Mage.Sets/src/mage/cards/s/StaffOfTheMindMagus.java index 46c3480aed9..35d3e0d08a5 100644 --- a/Mage.Sets/src/mage/cards/s/StaffOfTheMindMagus.java +++ b/Mage.Sets/src/mage/cards/s/StaffOfTheMindMagus.java @@ -35,6 +35,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.common.FilterLandPermanent; @@ -52,7 +53,7 @@ public class StaffOfTheMindMagus extends CardImpl { static { filterSpell.add(new ColorPredicate(ObjectColor.BLUE)); - filterLand.add(new SubtypePredicate("Island")); + filterLand.add(new SubtypePredicate(SubType.ISLAND)); } public StaffOfTheMindMagus(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/StarDestroyer.java b/Mage.Sets/src/mage/cards/s/StarDestroyer.java index e6f2488d774..54db0188f4f 100644 --- a/Mage.Sets/src/mage/cards/s/StarDestroyer.java +++ b/Mage.Sets/src/mage/cards/s/StarDestroyer.java @@ -39,6 +39,7 @@ import mage.abilities.keyword.SpaceflightAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreatureOrPlayer; import mage.filter.common.FilterCreaturePermanent; @@ -60,7 +61,7 @@ public class StarDestroyer extends CardImpl { static { filter1.add(new CardTypePredicate(CardType.ARTIFACT)); - filter3.getCreatureFilter().add(Predicates.not(new SubtypePredicate("Starship"))); + filter3.getCreatureFilter().add(Predicates.not(new SubtypePredicate(SubType.STARSHIP))); } public StarDestroyer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SteelshaperApprentice.java b/Mage.Sets/src/mage/cards/s/SteelshaperApprentice.java index c65c13a1b14..64a8cf7911b 100644 --- a/Mage.Sets/src/mage/cards/s/SteelshaperApprentice.java +++ b/Mage.Sets/src/mage/cards/s/SteelshaperApprentice.java @@ -32,6 +32,7 @@ import java.util.UUID; import mage.constants.CardType; import mage.constants.ColoredManaSymbol; +import mage.constants.SubType; import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; @@ -56,7 +57,7 @@ public class SteelshaperApprentice extends CardImpl { static { filter.add(new CardTypePredicate(CardType.ARTIFACT)); - filter.add(new SubtypePredicate("Equipment")); + filter.add(new SubtypePredicate(SubType.EQUIPMENT)); } public SteelshaperApprentice(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/StinkdrinkerDaredevil.java b/Mage.Sets/src/mage/cards/s/StinkdrinkerDaredevil.java index e56f6e6036f..b9bf7c5928a 100644 --- a/Mage.Sets/src/mage/cards/s/StinkdrinkerDaredevil.java +++ b/Mage.Sets/src/mage/cards/s/StinkdrinkerDaredevil.java @@ -29,6 +29,7 @@ package mage.cards.s; import java.util.UUID; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; @@ -47,7 +48,7 @@ public class StinkdrinkerDaredevil extends CardImpl { private static final FilterCard filter = new FilterCard("Giant spells"); static { - filter.add(new SubtypePredicate("Giant")); + filter.add(new SubtypePredicate(SubType.GIANT)); } public StinkdrinkerDaredevil(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/StonehewerGiant.java b/Mage.Sets/src/mage/cards/s/StonehewerGiant.java index ebbb2230009..145d5e46979 100644 --- a/Mage.Sets/src/mage/cards/s/StonehewerGiant.java +++ b/Mage.Sets/src/mage/cards/s/StonehewerGiant.java @@ -30,6 +30,7 @@ package mage.cards.s; import java.util.UUID; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; @@ -107,7 +108,7 @@ class StonehewerGiantEffect extends OneShotEffect { } FilterCard filter = new FilterCard("Equipment"); - filter.add(new SubtypePredicate("Equipment")); + filter.add(new SubtypePredicate(SubType.EQUIPMENT)); TargetCardInLibrary target = new TargetCardInLibrary(filter); if (player.searchLibrary(target, game)) { Card card = player.getLibrary().getCard(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/s/StonybrookBanneret.java b/Mage.Sets/src/mage/cards/s/StonybrookBanneret.java index f7c5f07cddf..09c1f715916 100644 --- a/Mage.Sets/src/mage/cards/s/StonybrookBanneret.java +++ b/Mage.Sets/src/mage/cards/s/StonybrookBanneret.java @@ -29,6 +29,7 @@ package mage.cards.s; import java.util.UUID; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; @@ -50,8 +51,8 @@ public class StonybrookBanneret extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate("Merfolk"), - new SubtypePredicate("Wizard"))); + new SubtypePredicate(SubType.MERFOLK), + new SubtypePredicate(SubType.WIZARD))); } public StonybrookBanneret(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/StormwingDragon.java b/Mage.Sets/src/mage/cards/s/StormwingDragon.java index cd0bc4c0a46..f1b626490c4 100644 --- a/Mage.Sets/src/mage/cards/s/StormwingDragon.java +++ b/Mage.Sets/src/mage/cards/s/StormwingDragon.java @@ -38,6 +38,7 @@ import mage.abilities.keyword.MorphAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -53,7 +54,7 @@ public class StormwingDragon extends CardImpl { static { filter.add(new AnotherPredicate()); - filter.add(new SubtypePredicate("Dragon")); + filter.add(new SubtypePredicate(SubType.DRAGON)); } public StormwingDragon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/StrengthOfArms.java b/Mage.Sets/src/mage/cards/s/StrengthOfArms.java index 6f41beb688d..435deee1cfc 100644 --- a/Mage.Sets/src/mage/cards/s/StrengthOfArms.java +++ b/Mage.Sets/src/mage/cards/s/StrengthOfArms.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; 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.game.permanent.token.HumanSoldierToken; @@ -51,7 +52,7 @@ public class StrengthOfArms extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("If you control an Equipment,"); static { - filter.add(new SubtypePredicate("Equipment")); + filter.add(new SubtypePredicate(SubType.EQUIPMENT)); } public StrengthOfArms(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/StripBare.java b/Mage.Sets/src/mage/cards/s/StripBare.java index e62468c9ed1..cc54780ac23 100644 --- a/Mage.Sets/src/mage/cards/s/StripBare.java +++ b/Mage.Sets/src/mage/cards/s/StripBare.java @@ -34,6 +34,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -88,8 +89,8 @@ class StripBareEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { boolean applied = false; FilterPermanent filter = new FilterPermanent(); - filter.add(Predicates.or(new SubtypePredicate("Equipment"), - new SubtypePredicate("Aura"))); + filter.add(Predicates.or(new SubtypePredicate(SubType.EQUIPMENT), + new SubtypePredicate(SubType.AURA))); Permanent targetCreature = game.getPermanent(source.getFirstTarget()); if (targetCreature != null && !targetCreature.getAttachments().isEmpty()) { diff --git a/Mage.Sets/src/mage/cards/s/StromkirkCaptain.java b/Mage.Sets/src/mage/cards/s/StromkirkCaptain.java index 4fd760a8bae..57b1e1589a7 100644 --- a/Mage.Sets/src/mage/cards/s/StromkirkCaptain.java +++ b/Mage.Sets/src/mage/cards/s/StromkirkCaptain.java @@ -38,6 +38,7 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -50,7 +51,7 @@ public class StromkirkCaptain extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Vampire creatures"); static { - filter.add(new SubtypePredicate("Vampire")); + filter.add(new SubtypePredicate(SubType.VAMPIRE)); } public StromkirkCaptain(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/StromkirkNoble.java b/Mage.Sets/src/mage/cards/s/StromkirkNoble.java index cf4a505bd77..b14e9cc346f 100644 --- a/Mage.Sets/src/mage/cards/s/StromkirkNoble.java +++ b/Mage.Sets/src/mage/cards/s/StromkirkNoble.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -52,7 +53,7 @@ public class StromkirkNoble extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Humans"); static { - filter.add(new SubtypePredicate("Human")); + filter.add(new SubtypePredicate(SubType.HUMAN)); } public StromkirkNoble(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SummonTheSchool.java b/Mage.Sets/src/mage/cards/s/SummonTheSchool.java index c456f6e6c16..8e1ecbbe103 100644 --- a/Mage.Sets/src/mage/cards/s/SummonTheSchool.java +++ b/Mage.Sets/src/mage/cards/s/SummonTheSchool.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; @@ -54,7 +55,7 @@ public class SummonTheSchool extends CardImpl { static { filter.add(Predicates.not(new TappedPredicate())); - filter.add(new SubtypePredicate("Merfolk")); + filter.add(new SubtypePredicate(SubType.MERFOLK)); } public SummonTheSchool(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SupremeInquisitor.java b/Mage.Sets/src/mage/cards/s/SupremeInquisitor.java index 17c902347f6..7bcee8640eb 100644 --- a/Mage.Sets/src/mage/cards/s/SupremeInquisitor.java +++ b/Mage.Sets/src/mage/cards/s/SupremeInquisitor.java @@ -40,6 +40,7 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; @@ -61,7 +62,7 @@ public class SupremeInquisitor extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Wizards you control"); static { - filter.add(new SubtypePredicate("Wizard")); + filter.add(new SubtypePredicate(SubType.WIZARD)); filter.add(Predicates.not(new TappedPredicate())); } diff --git a/Mage.Sets/src/mage/cards/s/SylvanPrimordial.java b/Mage.Sets/src/mage/cards/s/SylvanPrimordial.java index e5d0da99038..19237dc4375 100644 --- a/Mage.Sets/src/mage/cards/s/SylvanPrimordial.java +++ b/Mage.Sets/src/mage/cards/s/SylvanPrimordial.java @@ -38,6 +38,7 @@ import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterLandCard; import mage.filter.predicate.Predicates; @@ -102,7 +103,7 @@ class SylvanPrimordialEffect extends OneShotEffect { private static final FilterLandCard filterForest = new FilterLandCard("Forest"); static{ - filterForest.add(new SubtypePredicate("Forest")); + filterForest.add(new SubtypePredicate(SubType.FOREST)); } public SylvanPrimordialEffect() { diff --git a/Mage.Sets/src/mage/cards/t/TakenoSamuraiGeneral.java b/Mage.Sets/src/mage/cards/t/TakenoSamuraiGeneral.java index c42e81577de..f5a017349bb 100644 --- a/Mage.Sets/src/mage/cards/t/TakenoSamuraiGeneral.java +++ b/Mage.Sets/src/mage/cards/t/TakenoSamuraiGeneral.java @@ -78,7 +78,7 @@ class TakenoSamuraiGeneralEffect extends ContinuousEffectImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); static { - filter.add(new SubtypePredicate("Samurai")); + filter.add(new SubtypePredicate(SubType.SAMURAI)); } public TakenoSamuraiGeneralEffect() { diff --git a/Mage.Sets/src/mage/cards/t/TalonSliver.java b/Mage.Sets/src/mage/cards/t/TalonSliver.java index 9d7e600c621..f8515a10fb7 100644 --- a/Mage.Sets/src/mage/cards/t/TalonSliver.java +++ b/Mage.Sets/src/mage/cards/t/TalonSliver.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -49,7 +50,7 @@ public class TalonSliver extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("All Sliver creatures"); static { - filter.add(new SubtypePredicate("Sliver")); + filter.add(new SubtypePredicate(SubType.SLIVER)); } public TalonSliver(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TarPitcher.java b/Mage.Sets/src/mage/cards/t/TarPitcher.java index dae7fb7c057..17e07d1d2ea 100644 --- a/Mage.Sets/src/mage/cards/t/TarPitcher.java +++ b/Mage.Sets/src/mage/cards/t/TarPitcher.java @@ -36,6 +36,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent; @@ -53,7 +54,7 @@ public class TarPitcher extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Goblin"); static { - filter.add(new SubtypePredicate("Goblin")); + filter.add(new SubtypePredicate(SubType.GOBLIN)); } public TarPitcher(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TerentatekCub.java b/Mage.Sets/src/mage/cards/t/TerentatekCub.java index ece8dbac328..f582f06dbb4 100644 --- a/Mage.Sets/src/mage/cards/t/TerentatekCub.java +++ b/Mage.Sets/src/mage/cards/t/TerentatekCub.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -52,7 +53,7 @@ public class TerentatekCub extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Hunter or Rogue card"); static { - filter.add(Predicates.or(new SubtypePredicate("Jedi"), new SubtypePredicate("Sith"))); + filter.add(Predicates.or(new SubtypePredicate(SubType.JEDI), new SubtypePredicate(SubType.SITH))); } public TerentatekCub(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/ThaliasLieutenant.java b/Mage.Sets/src/mage/cards/t/ThaliasLieutenant.java index 76ebad5e4d7..fc12bf64bd7 100644 --- a/Mage.Sets/src/mage/cards/t/ThaliasLieutenant.java +++ b/Mage.Sets/src/mage/cards/t/ThaliasLieutenant.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -51,7 +52,7 @@ public class ThaliasLieutenant extends CardImpl { static { filter.add(new AnotherPredicate()); - filter.add(new SubtypePredicate("Human")); + filter.add(new SubtypePredicate(SubType.HUMAN)); } public ThaliasLieutenant(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/ThallidDevourer.java b/Mage.Sets/src/mage/cards/t/ThallidDevourer.java index 345201cc082..d18b152e980 100644 --- a/Mage.Sets/src/mage/cards/t/ThallidDevourer.java +++ b/Mage.Sets/src/mage/cards/t/ThallidDevourer.java @@ -38,10 +38,7 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -56,7 +53,7 @@ public class ThallidDevourer extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Saproling"); static { - filter.add(new SubtypePredicate("Saproling")); + filter.add(new SubtypePredicate(SubType.SAPROLING)); } public ThallidDevourer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TheUnspeakable.java b/Mage.Sets/src/mage/cards/t/TheUnspeakable.java index 93b61d00b12..193caae9b81 100644 --- a/Mage.Sets/src/mage/cards/t/TheUnspeakable.java +++ b/Mage.Sets/src/mage/cards/t/TheUnspeakable.java @@ -36,6 +36,7 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -52,7 +53,7 @@ public class TheUnspeakable extends CardImpl { private static final FilterCard filter = new FilterCard("Arcane card from your graveyard"); static { - filter.add(new SubtypePredicate("Arcane")); + filter.add(new SubtypePredicate(SubType.ARCANE)); } public TheUnspeakable(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/ThievingSprite.java b/Mage.Sets/src/mage/cards/t/ThievingSprite.java index 723dd9d9936..b385ecb7464 100644 --- a/Mage.Sets/src/mage/cards/t/ThievingSprite.java +++ b/Mage.Sets/src/mage/cards/t/ThievingSprite.java @@ -41,6 +41,7 @@ import mage.cards.Cards; import mage.cards.CardsImpl; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; @@ -112,7 +113,7 @@ class ThievingSpriteEffect extends OneShotEffect { } FilterControlledPermanent filter = new FilterControlledPermanent(); - filter.add(new SubtypePredicate("Faerie")); + filter.add(new SubtypePredicate(SubType.FAERIE)); int numberOfFaeries = game.getBattlefield().countAll(filter, controller.getId(), game); Cards revealedCards = new CardsImpl(); diff --git a/Mage.Sets/src/mage/cards/t/ThingFromTheDeep.java b/Mage.Sets/src/mage/cards/t/ThingFromTheDeep.java index 269b189fba9..77aac5dc4d0 100644 --- a/Mage.Sets/src/mage/cards/t/ThingFromTheDeep.java +++ b/Mage.Sets/src/mage/cards/t/ThingFromTheDeep.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect; import mage.cards.CardImpl; 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; @@ -49,7 +50,7 @@ public class ThingFromTheDeep extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("an Island"); static{ - filter.add(new SubtypePredicate("Island")); + filter.add(new SubtypePredicate(SubType.ISLAND)); } public ThingFromTheDeep(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/Thoughtleech.java b/Mage.Sets/src/mage/cards/t/Thoughtleech.java index 3b1bc5ebccc..f9e4e6dcdb6 100644 --- a/Mage.Sets/src/mage/cards/t/Thoughtleech.java +++ b/Mage.Sets/src/mage/cards/t/Thoughtleech.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -48,7 +49,7 @@ public class Thoughtleech extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("an Island an opponent controls"); static { - filter.add(new SubtypePredicate("Island")); + filter.add(new SubtypePredicate(SubType.ISLAND)); filter.add(new ControllerPredicate(TargetController.OPPONENT)); } diff --git a/Mage.Sets/src/mage/cards/t/ThunderOfHooves.java b/Mage.Sets/src/mage/cards/t/ThunderOfHooves.java index a01c311520e..1c9f9b4867f 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderOfHooves.java +++ b/Mage.Sets/src/mage/cards/t/ThunderOfHooves.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -52,7 +53,7 @@ public class ThunderOfHooves extends CardImpl { static { filterNotFlying.add(Predicates.not(new AbilityPredicate(FlyingAbility.class))); - filterBeasts.add(new SubtypePredicate("Beast")); + filterBeasts.add(new SubtypePredicate(SubType.BEAST)); } public ThunderOfHooves(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/Thwart.java b/Mage.Sets/src/mage/cards/t/Thwart.java index f57fc2d2d6b..cacfd947309 100644 --- a/Mage.Sets/src/mage/cards/t/Thwart.java +++ b/Mage.Sets/src/mage/cards/t/Thwart.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; 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.TargetSpell; @@ -46,7 +47,7 @@ import mage.target.common.TargetControlledPermanent; public class Thwart extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("Islands"); static{ - filter.add(new SubtypePredicate("Island")); + filter.add(new SubtypePredicate(SubType.ISLAND)); } public Thwart(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{U}{U}"); diff --git a/Mage.Sets/src/mage/cards/t/Tidewalker.java b/Mage.Sets/src/mage/cards/t/Tidewalker.java index 57b7a8e01d9..fd4d0721203 100644 --- a/Mage.Sets/src/mage/cards/t/Tidewalker.java +++ b/Mage.Sets/src/mage/cards/t/Tidewalker.java @@ -41,6 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; @@ -55,7 +56,7 @@ public class Tidewalker extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Island you control"); static { - filter.add(new SubtypePredicate("Island")); + filter.add(new SubtypePredicate(SubType.ISLAND)); } public Tidewalker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TimbermawLarva.java b/Mage.Sets/src/mage/cards/t/TimbermawLarva.java index f6e58515290..f7299fb2b2a 100644 --- a/Mage.Sets/src/mage/cards/t/TimbermawLarva.java +++ b/Mage.Sets/src/mage/cards/t/TimbermawLarva.java @@ -30,6 +30,7 @@ package mage.cards.t; import java.util.UUID; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.TargetController; import mage.MageInt; import mage.abilities.common.AttacksTriggeredAbility; @@ -50,7 +51,7 @@ public class TimbermawLarva extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Forest you control"); static { - filter.add(new SubtypePredicate("Forest")); + filter.add(new SubtypePredicate(SubType.FOREST)); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/t/TimberwatchElf.java b/Mage.Sets/src/mage/cards/t/TimberwatchElf.java index ba394f15e70..cdcbc47bbd8 100644 --- a/Mage.Sets/src/mage/cards/t/TimberwatchElf.java +++ b/Mage.Sets/src/mage/cards/t/TimberwatchElf.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -52,7 +53,7 @@ public class TimberwatchElf extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Elves"); static { - filter.add(new SubtypePredicate("Elf")); + filter.add(new SubtypePredicate(SubType.ELF)); } public TimberwatchElf(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TradeFederationBattleship.java b/Mage.Sets/src/mage/cards/t/TradeFederationBattleship.java index a8ffb4ca952..61c3a10a8b8 100644 --- a/Mage.Sets/src/mage/cards/t/TradeFederationBattleship.java +++ b/Mage.Sets/src/mage/cards/t/TradeFederationBattleship.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -53,7 +54,7 @@ public class TradeFederationBattleship extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Droid creatures"); static { - filter.add(new SubtypePredicate("Droid")); + filter.add(new SubtypePredicate(SubType.DROID)); } public TradeFederationBattleship(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 dcc22f5c2e5..bf73c13347f 100644 --- a/Mage.Sets/src/mage/cards/u/UmbraMystic.java +++ b/Mage.Sets/src/mage/cards/u/UmbraMystic.java @@ -30,6 +30,7 @@ package mage.cards.u; import java.util.UUID; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; @@ -53,7 +54,7 @@ public class UmbraMystic extends CardImpl { private static final FilterEnchantmentPermanent filter = new FilterEnchantmentPermanent("Auras attached to permanents you control"); static { - filter.add(new SubtypePredicate("Aura")); + filter.add(new SubtypePredicate(SubType.AURA)); } public UmbraMystic(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 40fd6b2296f..c100dc9ba18 100644 --- a/Mage.Sets/src/mage/cards/u/UnderworldSlums.java +++ b/Mage.Sets/src/mage/cards/u/UnderworldSlums.java @@ -35,10 +35,7 @@ import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicates; @@ -89,9 +86,9 @@ public class UnderworldSlums extends CardImpl { FilterCard filter = new FilterCard("basic Swamp, Mountain or Forest"); filter.add(new CardTypePredicate(CardType.LAND)); ArrayList> subtypePredicates = new ArrayList<>(); - subtypePredicates.add(new SubtypePredicate("Swamp")); - subtypePredicates.add(new SubtypePredicate("Mountain")); - subtypePredicates.add(new SubtypePredicate("Forest")); + subtypePredicates.add(new SubtypePredicate(SubType.SWAMP)); + subtypePredicates.add(new SubtypePredicate(SubType.MOUNTAIN)); + subtypePredicates.add(new SubtypePredicate(SubType.FOREST)); 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/UnholyGrotto.java b/Mage.Sets/src/mage/cards/u/UnholyGrotto.java index 4a90e3b24cd..781db54556f 100644 --- a/Mage.Sets/src/mage/cards/u/UnholyGrotto.java +++ b/Mage.Sets/src/mage/cards/u/UnholyGrotto.java @@ -37,6 +37,7 @@ import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -51,7 +52,7 @@ public class UnholyGrotto extends CardImpl { private static final FilterCard filter = new FilterCard("Zombie card from your graveyard"); static { - filter.add(new SubtypePredicate("Zombie")); + filter.add(new SubtypePredicate(SubType.ZOMBIE)); } public UnholyGrotto(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/u/UrgentExorcism.java b/Mage.Sets/src/mage/cards/u/UrgentExorcism.java index 311b16933c8..3746cf9e5c3 100644 --- a/Mage.Sets/src/mage/cards/u/UrgentExorcism.java +++ b/Mage.Sets/src/mage/cards/u/UrgentExorcism.java @@ -31,6 +31,7 @@ import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -49,7 +50,7 @@ public class UrgentExorcism extends CardImpl { static { filter.add(Predicates.or( - new SubtypePredicate("Spirit"), + new SubtypePredicate(SubType.SPIRIT), new CardTypePredicate(CardType.ENCHANTMENT))); } diff --git a/Mage.Sets/src/mage/cards/v/VastwoodAnimist.java b/Mage.Sets/src/mage/cards/v/VastwoodAnimist.java index ed8ea6d699b..a16fcc5b9f1 100644 --- a/Mage.Sets/src/mage/cards/v/VastwoodAnimist.java +++ b/Mage.Sets/src/mage/cards/v/VastwoodAnimist.java @@ -38,10 +38,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.BecomesCreatureTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -85,7 +82,7 @@ class VastwoodAnimistEffect extends OneShotEffect { final static FilterControlledPermanent filterAllies = new FilterControlledPermanent("allies you control"); static { - filterAllies.add(new SubtypePredicate("Ally")); + filterAllies.add(new SubtypePredicate(SubType.ALLY)); } public VastwoodAnimistEffect() { diff --git a/Mage.Sets/src/mage/cards/v/VedalkenShackles.java b/Mage.Sets/src/mage/cards/v/VedalkenShackles.java index d8eaabff959..db3b6e338ed 100644 --- a/Mage.Sets/src/mage/cards/v/VedalkenShackles.java +++ b/Mage.Sets/src/mage/cards/v/VedalkenShackles.java @@ -40,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterLandPermanent; @@ -92,7 +93,7 @@ class PowerIslandPredicate implements ObjectPlayerPredicate { this.subtype = subtype; } - public SubtypePredicate(String subtype){ - this.subtype = SubType.byDescription(subtype); - } @Override public boolean apply(MageObject input, Game game) { 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 67c125adfd5..d38928cfad0 100644 --- a/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/KothOfTheHammerEmblem.java @@ -33,13 +33,10 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.DamageTargetEffect; -import mage.constants.Duration; -import mage.constants.Layer; +import mage.constants.*; + import static mage.constants.Layer.AbilityAddingRemovingEffects_6; -import mage.constants.Outcome; -import mage.constants.SubLayer; -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; @@ -66,7 +63,7 @@ class KothOfTheHammerThirdEffect extends ContinuousEffectImpl { static final FilterLandPermanent mountains = new FilterLandPermanent("Mountain you control"); static { - mountains.add(new SubtypePredicate("Mountain")); + mountains.add(new SubtypePredicate(SubType.MOUNTAIN)); mountains.add(new ControllerPredicate(TargetController.YOU)); } 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 aa52f16db0b..824ea46097f 100644 --- a/Mage/src/main/java/mage/game/command/emblems/LilianaTheLastHopeEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/LilianaTheLastHopeEmblem.java @@ -32,6 +32,7 @@ import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; +import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; @@ -59,7 +60,7 @@ class LilianaZombiesCount implements DynamicValue { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); static { - filter.add(new SubtypePredicate("Zombie")); + filter.add(new SubtypePredicate(SubType.ZOMBIE)); } @Override