From 813d84274aebc61e2153e164d17f267798865fb8 Mon Sep 17 00:00:00 2001 From: ingmargoudt Date: Sun, 9 Apr 2017 10:50:31 +0200 Subject: [PATCH] removed string constructor in SuperTypePredicate --- Mage.Sets/src/mage/cards/a/Anathemancer.java | 3 ++- Mage.Sets/src/mage/cards/a/ArenaOfTheAncients.java | 7 ++----- .../src/mage/cards/a/AyumiTheLastVisitor.java | 2 +- Mage.Sets/src/mage/cards/b/BantPanorama.java | 6 +++--- Mage.Sets/src/mage/cards/b/BurningEarth.java | 3 ++- Mage.Sets/src/mage/cards/c/CanopyVista.java | 6 +++--- Mage.Sets/src/mage/cards/c/CaptainSisay.java | 2 +- Mage.Sets/src/mage/cards/c/ChillToTheBone.java | 3 ++- Mage.Sets/src/mage/cards/c/ColdSnap.java | 7 ++----- Mage.Sets/src/mage/cards/d/DayOfDestiny.java | 2 +- Mage.Sets/src/mage/cards/d/DiamondFaerie.java | 2 +- .../src/mage/cards/d/DjinnOfInfiniteDeceits.java | 7 ++----- Mage.Sets/src/mage/cards/e/Earthcraft.java | 3 ++- Mage.Sets/src/mage/cards/e/EmpressGalina.java | 2 +- Mage.Sets/src/mage/cards/e/Encroach.java | 3 ++- Mage.Sets/src/mage/cards/e/EsperPanorama.java | 3 ++- Mage.Sets/src/mage/cards/e/EyeOfSingularity.java | 4 ++-- Mage.Sets/src/mage/cards/f/FirebrandRanger.java | 4 ++-- Mage.Sets/src/mage/cards/f/FirewildBorderpost.java | 3 ++- Mage.Sets/src/mage/cards/g/GlacialCrevasses.java | 3 ++- Mage.Sets/src/mage/cards/g/GoryosVengeance.java | 7 ++----- Mage.Sets/src/mage/cards/g/GrixisPanorama.java | 3 ++- Mage.Sets/src/mage/cards/h/HallowedGround.java | 6 ++++-- .../src/mage/cards/h/HeidarRimewindMaster.java | 2 +- Mage.Sets/src/mage/cards/h/HeroesPodium.java | 6 +++--- Mage.Sets/src/mage/cards/h/HerosBlade.java | 11 ++++------- Mage.Sets/src/mage/cards/h/HerosDemise.java | 8 +++++--- Mage.Sets/src/mage/cards/h/HonorWornShaku.java | 13 +++++++------ Mage.Sets/src/mage/cards/i/Imperiosaur.java | 6 ++++-- Mage.Sets/src/mage/cards/i/IntoTheNorth.java | 6 ++++-- .../src/mage/cards/i/IwamoriOfTheOpenFist.java | 2 +- .../src/mage/cards/j/JaliraMasterPolymorphist.java | 2 +- Mage.Sets/src/mage/cards/j/JediEnclave.java | 3 ++- Mage.Sets/src/mage/cards/j/JundPanorama.java | 12 +++++++----- Mage.Sets/src/mage/cards/j/JungleVillage.java | 8 +++++--- Mage.Sets/src/mage/cards/k/Karakas.java | 10 +++++----- Mage.Sets/src/mage/cards/k/KashiTribeElite.java | 9 +++++---- .../src/mage/cards/k/KikiJikiMirrorBreaker.java | 2 +- Mage.Sets/src/mage/cards/k/KondasBanner.java | 2 +- Mage.Sets/src/mage/cards/k/KondasHatamoto.java | 6 ++++-- Mage.Sets/src/mage/cards/l/LayBareTheHeart.java | 6 ++++-- Mage.Sets/src/mage/cards/l/LegionsOfLimDul.java | 6 ++++-- Mage.Sets/src/mage/cards/l/Lifespinner.java | 6 ++++-- .../mage/cards/l/LilianaDefiantNecromancer.java | 10 ++++------ Mage.Sets/src/mage/cards/l/Lobotomy.java | 12 +++++------- Mage.Sets/src/mage/cards/l/LoyalRetainers.java | 3 ++- Mage.Sets/src/mage/cards/m/MagusOfTheMoon.java | 2 +- Mage.Sets/src/mage/cards/m/Mirrorweave.java | 6 ++++-- Mage.Sets/src/mage/cards/m/MistveinBorderpost.java | 8 +++++--- Mage.Sets/src/mage/cards/n/NayaPanorama.java | 12 +++++++----- Mage.Sets/src/mage/cards/n/NissaVastwoodSeer.java | 2 +- Mage.Sets/src/mage/cards/o/OhranYeti.java | 2 +- .../mage/cards/o/OkinaTempleToTheGrandfathers.java | 8 ++++---- Mage.Sets/src/mage/cards/p/PrairieStream.java | 7 ++++--- Mage.Sets/src/mage/cards/r/RimeDryad.java | 6 ++++-- Mage.Sets/src/mage/cards/r/RimeTransfusion.java | 2 +- Mage.Sets/src/mage/cards/r/RimewindCryomancer.java | 6 ++++-- Mage.Sets/src/mage/cards/r/RimewindTaskmage.java | 6 ++++-- Mage.Sets/src/mage/cards/r/RonomHulk.java | 6 ++++-- .../src/mage/cards/s/ShinkaTheBloodsoakedKeep.java | 8 ++++---- .../src/mage/cards/s/ShizoDeathsStorehouse.java | 8 ++++---- Mage.Sets/src/mage/cards/s/SithRuins.java | 3 ++- Mage.Sets/src/mage/cards/s/Skred.java | 3 ++- .../src/mage/cards/s/SquanderedResources.java | 10 ++++++---- Mage.Sets/src/mage/cards/s/StarCompass.java | 10 ++++++---- Mage.Sets/src/mage/cards/s/SunkenHollow.java | 7 ++++--- Mage.Sets/src/mage/cards/s/Sunstone.java | 6 ++++-- Mage.Sets/src/mage/cards/s/SurgicalExtraction.java | 14 ++++++-------- Mage.Sets/src/mage/cards/s/SwordOfTheChosen.java | 2 +- Mage.Sets/src/mage/cards/t/TenzaGodosMaul.java | 11 +++++------ Mage.Sets/src/mage/cards/t/TimeOfNeed.java | 9 +++++---- Mage.Sets/src/mage/cards/t/TsaboTavoc.java | 4 ++-- Mage.Sets/src/mage/cards/u/UnderworldSlums.java | 3 ++- Mage.Sets/src/mage/cards/v/VolcanicOffering.java | 8 +++++--- .../src/mage/cards/v/VolrathsShapeshifter.java | 2 +- Mage.Sets/src/mage/cards/w/WaveOfVitriol.java | 10 ++++------ Mage.Sets/src/mage/cards/w/Whiteout.java | 6 ++++-- .../src/mage/cards/w/WildernessElemental.java | 10 ++++------ .../src/mage/cards/w/WildfieldBorderpost.java | 8 +++++--- Mage.Sets/src/mage/cards/w/WillowSatyr.java | 6 ++++-- Mage.Sets/src/mage/cards/w/WoodlandBellower.java | 6 ++++-- .../src/mage/cards/y/YomijiWhoBarsTheWay.java | 5 +++-- .../mage/abilities/effects/common/CopyEffect.java | 5 +++-- .../abilities/effects/common/CopyTokenEffect.java | 2 +- .../mage/abilities/keyword/TransformAbility.java | 2 +- .../predicate/mageobject/SupertypePredicate.java | 4 ---- .../mage/util/functions/CopyTokenFunction.java | 2 +- 87 files changed, 265 insertions(+), 224 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/Anathemancer.java b/Mage.Sets/src/mage/cards/a/Anathemancer.java index d677b6249c3..fcf3cee153d 100644 --- a/Mage.Sets/src/mage/cards/a/Anathemancer.java +++ b/Mage.Sets/src/mage/cards/a/Anathemancer.java @@ -38,6 +38,7 @@ import mage.abilities.keyword.UnearthAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -88,7 +89,7 @@ class AnathemancerCount implements DynamicValue { } FilterLandPermanent filter = new FilterLandPermanent(); - filter.add(Predicates.not(new SupertypePredicate("Basic"))); + filter.add(Predicates.not(new SupertypePredicate(SuperType.BASIC))); filter.add(new ControllerIdPredicate(sourceAbility.getFirstTarget())); return game.getBattlefield().count(filter, sourceAbility.getSourceId(), sourceAbility.getControllerId(), game); diff --git a/Mage.Sets/src/mage/cards/a/ArenaOfTheAncients.java b/Mage.Sets/src/mage/cards/a/ArenaOfTheAncients.java index 7877964a6ac..9ca666e3b2d 100644 --- a/Mage.Sets/src/mage/cards/a/ArenaOfTheAncients.java +++ b/Mage.Sets/src/mage/cards/a/ArenaOfTheAncients.java @@ -12,10 +12,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.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -29,7 +26,7 @@ public class ArenaOfTheAncients extends CardImpl { private final static FilterCreaturePermanent legendaryFilter = new FilterCreaturePermanent("legendary creatures"); static { - legendaryFilter.add(new SupertypePredicate("Legendary")); + legendaryFilter.add(new SupertypePredicate(SuperType.LEGENDARY)); } public ArenaOfTheAncients(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/a/AyumiTheLastVisitor.java b/Mage.Sets/src/mage/cards/a/AyumiTheLastVisitor.java index 0e6284960cd..19d6dd6392e 100644 --- a/Mage.Sets/src/mage/cards/a/AyumiTheLastVisitor.java +++ b/Mage.Sets/src/mage/cards/a/AyumiTheLastVisitor.java @@ -46,7 +46,7 @@ public class AyumiTheLastVisitor extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("Legendary land"); static { - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); } public AyumiTheLastVisitor(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/b/BantPanorama.java b/Mage.Sets/src/mage/cards/b/BantPanorama.java index be57dd522d9..8a516cdacc5 100644 --- a/Mage.Sets/src/mage/cards/b/BantPanorama.java +++ b/Mage.Sets/src/mage/cards/b/BantPanorama.java @@ -38,6 +38,7 @@ 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.filter.FilterCard; import mage.filter.predicate.Predicates; @@ -49,7 +50,6 @@ import mage.target.common.TargetCardInLibrary; import java.util.UUID; /** - * * @author North */ public class BantPanorama extends CardImpl { @@ -58,7 +58,7 @@ public class BantPanorama extends CardImpl { static { filter.add(new CardTypePredicate(CardType.LAND)); - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); filter.add(Predicates.or( new SubtypePredicate("Forest"), new SubtypePredicate("Plains"), @@ -66,7 +66,7 @@ public class BantPanorama extends CardImpl { } public BantPanorama(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.LAND},""); + super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); // {T}: Add {C} to your mana pool. this.addAbility(new ColorlessManaAbility()); diff --git a/Mage.Sets/src/mage/cards/b/BurningEarth.java b/Mage.Sets/src/mage/cards/b/BurningEarth.java index eb0950150f1..06f967f5b8e 100644 --- a/Mage.Sets/src/mage/cards/b/BurningEarth.java +++ b/Mage.Sets/src/mage/cards/b/BurningEarth.java @@ -33,6 +33,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SetTargetPointer; +import mage.constants.SuperType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -48,7 +49,7 @@ public class BurningEarth extends CardImpl { private final static FilterLandPermanent filter = new FilterLandPermanent("a player taps a nonbasic land"); static { - filter.add(Predicates.not(new SupertypePredicate("Basic"))); + filter.add(Predicates.not(new SupertypePredicate(SuperType.BASIC))); } public BurningEarth(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/CanopyVista.java b/Mage.Sets/src/mage/cards/c/CanopyVista.java index ebfd4bf5478..50754aec89b 100644 --- a/Mage.Sets/src/mage/cards/c/CanopyVista.java +++ b/Mage.Sets/src/mage/cards/c/CanopyVista.java @@ -39,13 +39,13 @@ import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import java.util.UUID; /** - * * @author fireshoes */ public class CanopyVista extends CardImpl { @@ -53,11 +53,11 @@ public class CanopyVista extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); } public CanopyVista(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.LAND},""); + super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); this.subtype.add("Forest"); this.subtype.add("Plains"); diff --git a/Mage.Sets/src/mage/cards/c/CaptainSisay.java b/Mage.Sets/src/mage/cards/c/CaptainSisay.java index 7e016b5c8e3..b9527079059 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainSisay.java +++ b/Mage.Sets/src/mage/cards/c/CaptainSisay.java @@ -51,7 +51,7 @@ public class CaptainSisay extends CardImpl { private static final FilterCard filter = new FilterCard("legendary card"); static { - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); } public CaptainSisay(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ChillToTheBone.java b/Mage.Sets/src/mage/cards/c/ChillToTheBone.java index 3a8d00131fe..75b3d381d3b 100644 --- a/Mage.Sets/src/mage/cards/c/ChillToTheBone.java +++ b/Mage.Sets/src/mage/cards/c/ChillToTheBone.java @@ -31,6 +31,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -47,7 +48,7 @@ public class ChillToTheBone extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonsnow creature"); static { - filter.add(Predicates.not(new SupertypePredicate("Snow"))); + filter.add(Predicates.not(new SupertypePredicate(SuperType.SNOW))); } public ChillToTheBone(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/c/ColdSnap.java b/Mage.Sets/src/mage/cards/c/ColdSnap.java index d238f874c47..db251815e34 100644 --- a/Mage.Sets/src/mage/cards/c/ColdSnap.java +++ b/Mage.Sets/src/mage/cards/c/ColdSnap.java @@ -35,10 +35,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.CumulativeUpkeepAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.game.Game; @@ -77,7 +74,7 @@ class ColdSnapDamageTargetEffect extends OneShotEffect{ private static final FilterLandPermanent filter = new FilterLandPermanent("snow lands"); static { - filter.add(new SupertypePredicate("Snow")); + filter.add(new SupertypePredicate(SuperType.SNOW)); } public ColdSnapDamageTargetEffect() diff --git a/Mage.Sets/src/mage/cards/d/DayOfDestiny.java b/Mage.Sets/src/mage/cards/d/DayOfDestiny.java index aca43c5e361..7b07e66c421 100644 --- a/Mage.Sets/src/mage/cards/d/DayOfDestiny.java +++ b/Mage.Sets/src/mage/cards/d/DayOfDestiny.java @@ -49,7 +49,7 @@ public class DayOfDestiny extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Legendary creatures"); static { - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); } public DayOfDestiny(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DiamondFaerie.java b/Mage.Sets/src/mage/cards/d/DiamondFaerie.java index 095c40b53cb..df0e0d040a5 100644 --- a/Mage.Sets/src/mage/cards/d/DiamondFaerie.java +++ b/Mage.Sets/src/mage/cards/d/DiamondFaerie.java @@ -52,7 +52,7 @@ public class DiamondFaerie extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Snow creatures"); static { - filter.add(new SupertypePredicate("Snow")); + filter.add(new SupertypePredicate(SuperType.SNOW)); } public DiamondFaerie(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/d/DjinnOfInfiniteDeceits.java b/Mage.Sets/src/mage/cards/d/DjinnOfInfiniteDeceits.java index a934d84537e..63f11545ecb 100644 --- a/Mage.Sets/src/mage/cards/d/DjinnOfInfiniteDeceits.java +++ b/Mage.Sets/src/mage/cards/d/DjinnOfInfiniteDeceits.java @@ -37,10 +37,7 @@ import mage.abilities.effects.common.continuous.ExchangeControlTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TurnPhase; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -57,7 +54,7 @@ public class DjinnOfInfiniteDeceits extends CardImpl { private static final String rule = "Exchange control of two target nonlegendary creatures"; private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonlegendary creature"); static { - filter.add(Predicates.not(new SupertypePredicate("Legendary"))); + filter.add(Predicates.not(new SupertypePredicate(SuperType.LEGENDARY))); } public DjinnOfInfiniteDeceits(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/Earthcraft.java b/Mage.Sets/src/mage/cards/e/Earthcraft.java index 08218e471f1..5ec5770778b 100644 --- a/Mage.Sets/src/mage/cards/e/Earthcraft.java +++ b/Mage.Sets/src/mage/cards/e/Earthcraft.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.UntapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledPermanent; @@ -57,7 +58,7 @@ public class Earthcraft extends CardImpl { static { filterCreature.add(Predicates.not(new TappedPredicate())); filterLand.add(new CardTypePredicate(CardType.LAND)); - filterLand.add(new SupertypePredicate("Basic")); + filterLand.add(new SupertypePredicate(SuperType.BASIC)); } public Earthcraft(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/EmpressGalina.java b/Mage.Sets/src/mage/cards/e/EmpressGalina.java index 923ad57ce8a..c41b705e3e2 100644 --- a/Mage.Sets/src/mage/cards/e/EmpressGalina.java +++ b/Mage.Sets/src/mage/cards/e/EmpressGalina.java @@ -54,7 +54,7 @@ public class EmpressGalina extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("legendary permanent"); static { - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); } public EmpressGalina(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/e/Encroach.java b/Mage.Sets/src/mage/cards/e/Encroach.java index 2fafeb3c3ce..bac58da3652 100644 --- a/Mage.Sets/src/mage/cards/e/Encroach.java +++ b/Mage.Sets/src/mage/cards/e/Encroach.java @@ -31,6 +31,7 @@ import mage.abilities.effects.common.discard.DiscardCardYouChooseTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -48,7 +49,7 @@ public class Encroach extends CardImpl { private static final FilterCard filter = new FilterCard("a nonbasic land card"); static { - filter.add(Predicates.not(new SupertypePredicate("Basic"))); + filter.add(Predicates.not(new SupertypePredicate(SuperType.BASIC))); filter.add(new CardTypePredicate(CardType.LAND)); } diff --git a/Mage.Sets/src/mage/cards/e/EsperPanorama.java b/Mage.Sets/src/mage/cards/e/EsperPanorama.java index 702ea7d96c7..85d542b29ed 100644 --- a/Mage.Sets/src/mage/cards/e/EsperPanorama.java +++ b/Mage.Sets/src/mage/cards/e/EsperPanorama.java @@ -38,6 +38,7 @@ 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.filter.FilterCard; import mage.filter.predicate.Predicates; @@ -58,7 +59,7 @@ public class EsperPanorama extends CardImpl { static { filter.add(new CardTypePredicate(CardType.LAND)); - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); filter.add(Predicates.or( new SubtypePredicate("Plains"), new SubtypePredicate("Island"), diff --git a/Mage.Sets/src/mage/cards/e/EyeOfSingularity.java b/Mage.Sets/src/mage/cards/e/EyeOfSingularity.java index 8efa1c92ee7..f8608705ba3 100644 --- a/Mage.Sets/src/mage/cards/e/EyeOfSingularity.java +++ b/Mage.Sets/src/mage/cards/e/EyeOfSingularity.java @@ -83,7 +83,7 @@ class EyeOfSingularityETBEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterPermanent(); static { - filter.add(Predicates.not(new SupertypePredicate("Basic"))); + filter.add(Predicates.not(new SupertypePredicate(SuperType.BASIC))); } EyeOfSingularityETBEffect() { @@ -171,7 +171,7 @@ class EyeOfSingularityTriggeredEffect extends OneShotEffect { private static final FilterPermanent filter = new FilterPermanent(); static { - filter.add(Predicates.not(new SupertypePredicate("Basic"))); + filter.add(Predicates.not(new SupertypePredicate(SuperType.BASIC))); } EyeOfSingularityTriggeredEffect() { diff --git a/Mage.Sets/src/mage/cards/f/FirebrandRanger.java b/Mage.Sets/src/mage/cards/f/FirebrandRanger.java index f38b535482a..d4e22a78c66 100644 --- a/Mage.Sets/src/mage/cards/f/FirebrandRanger.java +++ b/Mage.Sets/src/mage/cards/f/FirebrandRanger.java @@ -38,6 +38,7 @@ 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.filter.FilterCard; import mage.filter.predicate.Predicates; @@ -83,7 +84,7 @@ class PutLandOnBattlefieldEffect extends OneShotEffect { private static final FilterCard filter = new FilterCard("basic land card"); static { - filter.add(Predicates.and(new CardTypePredicate(CardType.LAND), new SupertypePredicate("Basic"))); + filter.add(Predicates.and(new CardTypePredicate(CardType.LAND), new SupertypePredicate(SuperType.BASIC))); } private static final String choiceText = "Put a basic land card from your hand onto the battlefield?"; @@ -114,7 +115,6 @@ class PutLandOnBattlefieldEffect extends OneShotEffect { Card card = game.getCard(target.getFirstTarget()); if (card != null) { card.putOntoBattlefield(game, Zone.HAND, source.getSourceId(), source.getControllerId()); - return true; } } diff --git a/Mage.Sets/src/mage/cards/f/FirewildBorderpost.java b/Mage.Sets/src/mage/cards/f/FirewildBorderpost.java index 7ef953996ca..137f64a214a 100644 --- a/Mage.Sets/src/mage/cards/f/FirewildBorderpost.java +++ b/Mage.Sets/src/mage/cards/f/FirewildBorderpost.java @@ -38,6 +38,7 @@ import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -54,7 +55,7 @@ public class FirewildBorderpost extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("a basic land"); static { - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); } public FirewildBorderpost (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GlacialCrevasses.java b/Mage.Sets/src/mage/cards/g/GlacialCrevasses.java index b15bf4707f4..7191b238b55 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialCrevasses.java +++ b/Mage.Sets/src/mage/cards/g/GlacialCrevasses.java @@ -36,6 +36,7 @@ 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.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -54,7 +55,7 @@ public class GlacialCrevasses extends CardImpl { static { filter.add(new SubtypePredicate("Mountain")); - filter.add(new SupertypePredicate("Snow")); + filter.add(new SupertypePredicate(SuperType.SNOW)); } public GlacialCrevasses(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/g/GoryosVengeance.java b/Mage.Sets/src/mage/cards/g/GoryosVengeance.java index 46568679cfc..92481075dc9 100644 --- a/Mage.Sets/src/mage/cards/g/GoryosVengeance.java +++ b/Mage.Sets/src/mage/cards/g/GoryosVengeance.java @@ -40,10 +40,7 @@ import mage.abilities.keyword.SpliceOntoArcaneAbility; import mage.cards.Card; 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.FilterCard; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.game.Game; @@ -63,7 +60,7 @@ public class GoryosVengeance extends CardImpl { private static final FilterCard filter = new FilterCard("legendary creature card"); static { - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); } public GoryosVengeance(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 f007789d87c..2dd6af9c783 100644 --- a/Mage.Sets/src/mage/cards/g/GrixisPanorama.java +++ b/Mage.Sets/src/mage/cards/g/GrixisPanorama.java @@ -38,6 +38,7 @@ 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.filter.FilterCard; import mage.filter.predicate.Predicates; @@ -58,7 +59,7 @@ public class GrixisPanorama extends CardImpl { static { filter.add(new CardTypePredicate(CardType.LAND)); - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); filter.add(Predicates.or( new SubtypePredicate("Island"), new SubtypePredicate("Swamp"), diff --git a/Mage.Sets/src/mage/cards/h/HallowedGround.java b/Mage.Sets/src/mage/cards/h/HallowedGround.java index 54b842a7f60..a8e5561eed9 100644 --- a/Mage.Sets/src/mage/cards/h/HallowedGround.java +++ b/Mage.Sets/src/mage/cards/h/HallowedGround.java @@ -27,7 +27,6 @@ */ package mage.cards.h; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -35,6 +34,7 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; @@ -42,6 +42,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Styxo @@ -51,7 +53,7 @@ public class HallowedGround extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("nonsnow land you control"); static { - filter.add(Predicates.not(new SupertypePredicate("Snow"))); + filter.add(Predicates.not(new SupertypePredicate(SuperType.SNOW))); } public HallowedGround(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HeidarRimewindMaster.java b/Mage.Sets/src/mage/cards/h/HeidarRimewindMaster.java index b1f2a29630d..a5fd8ef2a2e 100644 --- a/Mage.Sets/src/mage/cards/h/HeidarRimewindMaster.java +++ b/Mage.Sets/src/mage/cards/h/HeidarRimewindMaster.java @@ -55,7 +55,7 @@ public class HeidarRimewindMaster extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("you control four or more snow permanents"); static { - filter.add(new SupertypePredicate("Snow")); + filter.add(new SupertypePredicate(SuperType.SNOW)); } public HeidarRimewindMaster(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HeroesPodium.java b/Mage.Sets/src/mage/cards/h/HeroesPodium.java index 61e68af17a6..ad6209235c5 100644 --- a/Mage.Sets/src/mage/cards/h/HeroesPodium.java +++ b/Mage.Sets/src/mage/cards/h/HeroesPodium.java @@ -57,7 +57,7 @@ public class HeroesPodium extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Each legendary creature you control"); static { - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); } public HeroesPodium(UUID ownerId, CardSetInfo setInfo) { @@ -90,7 +90,7 @@ class HeroesPodiumLegendaryCount implements DynamicValue { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other legendary creature you control"); static { - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); } @Override @@ -122,7 +122,7 @@ class HeroesPodiumEffect extends OneShotEffect { private static final FilterCreatureCard filter = new FilterCreatureCard("a legendary creature card"); static { - filter.add(new SupertypePredicate(("Legendary"))); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); } public HeroesPodiumEffect() { diff --git a/Mage.Sets/src/mage/cards/h/HerosBlade.java b/Mage.Sets/src/mage/cards/h/HerosBlade.java index 3526b617215..71abb37d83c 100644 --- a/Mage.Sets/src/mage/cards/h/HerosBlade.java +++ b/Mage.Sets/src/mage/cards/h/HerosBlade.java @@ -27,7 +27,6 @@ */ package mage.cards.h; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -36,16 +35,14 @@ import mage.abilities.effects.common.continuous.BoostEquippedEffect; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LevelX2 @@ -55,7 +52,7 @@ public class HerosBlade extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent("a legendary creature"); static { - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); filter.add(new ControllerPredicate(TargetController.YOU)); } diff --git a/Mage.Sets/src/mage/cards/h/HerosDemise.java b/Mage.Sets/src/mage/cards/h/HerosDemise.java index 0ad305fb1a1..e6cf5e14539 100644 --- a/Mage.Sets/src/mage/cards/h/HerosDemise.java +++ b/Mage.Sets/src/mage/cards/h/HerosDemise.java @@ -27,15 +27,17 @@ */ package mage.cards.h; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Loki @@ -45,7 +47,7 @@ public class HerosDemise extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature"); static { - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); } public HerosDemise(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/h/HonorWornShaku.java b/Mage.Sets/src/mage/cards/h/HonorWornShaku.java index 18ff7441776..d03103cd5f3 100644 --- a/Mage.Sets/src/mage/cards/h/HonorWornShaku.java +++ b/Mage.Sets/src/mage/cards/h/HonorWornShaku.java @@ -28,9 +28,6 @@ package mage.cards.h; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapTargetCost; @@ -38,6 +35,8 @@ import mage.abilities.effects.common.UntapSourceEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; @@ -45,6 +44,8 @@ import mage.filter.predicate.mageobject.SupertypePredicate; import mage.filter.predicate.permanent.TappedPredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * @author Loki */ @@ -54,15 +55,15 @@ public class HonorWornShaku extends CardImpl { static { filter.add(Predicates.not(new TappedPredicate())); - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); } public HonorWornShaku(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); this.addAbility(new ColorlessManaAbility()); Ability ability = new SimpleActivatedAbility( Zone.BATTLEFIELD, - new UntapSourceEffect(), + new UntapSourceEffect(), new TapTargetCost(new TargetControlledPermanent(filter))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/Imperiosaur.java b/Mage.Sets/src/mage/cards/i/Imperiosaur.java index 368c34856e9..fc74d498571 100644 --- a/Mage.Sets/src/mage/cards/i/Imperiosaur.java +++ b/Mage.Sets/src/mage/cards/i/Imperiosaur.java @@ -27,16 +27,18 @@ */ package mage.cards.i; -import java.util.UUID; import mage.MageInt; import mage.abilities.StaticAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; +import java.util.UUID; + /** * * @author LevelX2 @@ -45,7 +47,7 @@ public class Imperiosaur extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); } public Imperiosaur(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IntoTheNorth.java b/Mage.Sets/src/mage/cards/i/IntoTheNorth.java index 99d5a51053b..0a6e1fe43d8 100644 --- a/Mage.Sets/src/mage/cards/i/IntoTheNorth.java +++ b/Mage.Sets/src/mage/cards/i/IntoTheNorth.java @@ -27,16 +27,18 @@ */ package mage.cards.i; -import java.util.UUID; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.filter.common.FilterLandCard; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author LevelX2 @@ -46,7 +48,7 @@ public class IntoTheNorth extends CardImpl { private static final FilterLandCard filter = new FilterLandCard("snow land card"); static { - filter.add(new SupertypePredicate("Snow")); + filter.add(new SupertypePredicate(SuperType.SNOW)); } public IntoTheNorth(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/i/IwamoriOfTheOpenFist.java b/Mage.Sets/src/mage/cards/i/IwamoriOfTheOpenFist.java index aca5c102ae3..1622d083f0a 100644 --- a/Mage.Sets/src/mage/cards/i/IwamoriOfTheOpenFist.java +++ b/Mage.Sets/src/mage/cards/i/IwamoriOfTheOpenFist.java @@ -83,7 +83,7 @@ class IwamoriOfTheOpenFistEffect extends OneShotEffect { private static final FilterCard filter = new FilterCard("legendary creature card"); static { - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); filter.add(new CardTypePredicate(CardType.CREATURE)); } diff --git a/Mage.Sets/src/mage/cards/j/JaliraMasterPolymorphist.java b/Mage.Sets/src/mage/cards/j/JaliraMasterPolymorphist.java index 21396accd93..81553a7661b 100644 --- a/Mage.Sets/src/mage/cards/j/JaliraMasterPolymorphist.java +++ b/Mage.Sets/src/mage/cards/j/JaliraMasterPolymorphist.java @@ -59,7 +59,7 @@ public class JaliraMasterPolymorphist extends CardImpl { static { filterPermanent.add(new AnotherPredicate()); - filterCard.add(Predicates.not(new SupertypePredicate("Legendary"))); + filterCard.add(Predicates.not(new SupertypePredicate(SuperType.LEGENDARY))); } public JaliraMasterPolymorphist(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/j/JediEnclave.java b/Mage.Sets/src/mage/cards/j/JediEnclave.java index 0b4c7b096cd..487da2a49c3 100644 --- a/Mage.Sets/src/mage/cards/j/JediEnclave.java +++ b/Mage.Sets/src/mage/cards/j/JediEnclave.java @@ -37,6 +37,7 @@ 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.filter.FilterCard; import mage.filter.predicate.Predicate; @@ -92,7 +93,7 @@ public class JediEnclave extends CardImpl { subtypePredicates.add(new SubtypePredicate("Plains")); subtypePredicates.add(new SubtypePredicate("Island")); filter.add(Predicates.or(subtypePredicates)); - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); TargetCardInLibrary target = new TargetCardInLibrary(filter); addEffect(new SearchLibraryPutInPlayEffect(target, true, true, Outcome.PutLandInPlay)); } diff --git a/Mage.Sets/src/mage/cards/j/JundPanorama.java b/Mage.Sets/src/mage/cards/j/JundPanorama.java index 056992933c0..e99774d7711 100644 --- a/Mage.Sets/src/mage/cards/j/JundPanorama.java +++ b/Mage.Sets/src/mage/cards/j/JundPanorama.java @@ -28,10 +28,6 @@ package mage.cards.j; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -41,6 +37,10 @@ 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.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -48,6 +48,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com @@ -58,7 +60,7 @@ public class JundPanorama extends CardImpl { static { filter.add(new CardTypePredicate(CardType.LAND)); - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); filter.add(Predicates.or( new SubtypePredicate("Swamp"), new SubtypePredicate("Mountain"), diff --git a/Mage.Sets/src/mage/cards/j/JungleVillage.java b/Mage.Sets/src/mage/cards/j/JungleVillage.java index 61d83ad065f..31ae6d1200d 100644 --- a/Mage.Sets/src/mage/cards/j/JungleVillage.java +++ b/Mage.Sets/src/mage/cards/j/JungleVillage.java @@ -27,8 +27,6 @@ */ package mage.cards.j; -import java.util.ArrayList; -import java.util.UUID; import mage.MageObject; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.common.SacrificeSourceCost; @@ -39,6 +37,7 @@ 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.filter.FilterCard; import mage.filter.predicate.Predicate; @@ -48,6 +47,9 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.ArrayList; +import java.util.UUID; + /** * * @author Styxo @@ -91,7 +93,7 @@ public class JungleVillage extends CardImpl { subtypePredicates.add(new SubtypePredicate("Mountain")); subtypePredicates.add(new SubtypePredicate("Forest")); filter.add(Predicates.or(subtypePredicates)); - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); TargetCardInLibrary target = new TargetCardInLibrary(filter); addEffect(new SearchLibraryPutInPlayEffect(target, true, true, Outcome.PutLandInPlay)); } diff --git a/Mage.Sets/src/mage/cards/k/Karakas.java b/Mage.Sets/src/mage/cards/k/Karakas.java index 9f39d1a2d1a..281f8d80550 100644 --- a/Mage.Sets/src/mage/cards/k/Karakas.java +++ b/Mage.Sets/src/mage/cards/k/Karakas.java @@ -44,18 +44,18 @@ import mage.target.common.TargetCreaturePermanent; import java.util.UUID; /** - * * @author Plopman */ public class Karakas extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature"); - static{ - filter.add(new SupertypePredicate("Legendary")); + + static { + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); } - + public Karakas(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.LAND},""); + super(ownerId, setInfo, new CardType[]{CardType.LAND}, ""); addSuperType(SuperType.LEGENDARY); // {tap}: Add {W} to your mana pool. diff --git a/Mage.Sets/src/mage/cards/k/KashiTribeElite.java b/Mage.Sets/src/mage/cards/k/KashiTribeElite.java index 74624c7a756..31514f4c63d 100644 --- a/Mage.Sets/src/mage/cards/k/KashiTribeElite.java +++ b/Mage.Sets/src/mage/cards/k/KashiTribeElite.java @@ -27,9 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsDamageToACreatureTriggeredAbility; @@ -40,12 +37,16 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.ShroudAbility; 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.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; +import java.util.UUID; + /** * * @author LevelX @@ -55,7 +56,7 @@ public class KashiTribeElite extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Legendary Snakes"); static { - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); filter.add(new SubtypePredicate("Snake")); } diff --git a/Mage.Sets/src/mage/cards/k/KikiJikiMirrorBreaker.java b/Mage.Sets/src/mage/cards/k/KikiJikiMirrorBreaker.java index 89cdbcd9b92..2aa53b60785 100644 --- a/Mage.Sets/src/mage/cards/k/KikiJikiMirrorBreaker.java +++ b/Mage.Sets/src/mage/cards/k/KikiJikiMirrorBreaker.java @@ -61,7 +61,7 @@ public class KikiJikiMirrorBreaker extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("nonlegendary creature you control"); static { - filter.add(Predicates.not(new SupertypePredicate("Legendary"))); + filter.add(Predicates.not(new SupertypePredicate(SuperType.LEGENDARY))); } public KikiJikiMirrorBreaker(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KondasBanner.java b/Mage.Sets/src/mage/cards/k/KondasBanner.java index a385a89b22d..4ef27f1d2f3 100644 --- a/Mage.Sets/src/mage/cards/k/KondasBanner.java +++ b/Mage.Sets/src/mage/cards/k/KondasBanner.java @@ -57,7 +57,7 @@ public class KondasBanner extends CardImpl { private static final FilterControlledCreaturePermanent legendaryFilter = new FilterControlledCreaturePermanent("legendary creatures"); static { - legendaryFilter.add(new SupertypePredicate("Legendary")); + legendaryFilter.add(new SupertypePredicate(SuperType.LEGENDARY)); } public KondasBanner(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/k/KondasHatamoto.java b/Mage.Sets/src/mage/cards/k/KondasHatamoto.java index 6ddb8736051..7e3dd2855b4 100644 --- a/Mage.Sets/src/mage/cards/k/KondasHatamoto.java +++ b/Mage.Sets/src/mage/cards/k/KondasHatamoto.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; @@ -40,11 +39,14 @@ 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.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; +import java.util.UUID; + /** * * @author LevelX @@ -56,7 +58,7 @@ public class KondasHatamoto extends CardImpl { private static final String rule2 = "As long as you control a legendary Samurai, {this} has vigilance"; static { - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); filter.add(new SubtypePredicate("Samurai")); } diff --git a/Mage.Sets/src/mage/cards/l/LayBareTheHeart.java b/Mage.Sets/src/mage/cards/l/LayBareTheHeart.java index 4a2e53d2967..3603bee7d97 100644 --- a/Mage.Sets/src/mage/cards/l/LayBareTheHeart.java +++ b/Mage.Sets/src/mage/cards/l/LayBareTheHeart.java @@ -27,11 +27,11 @@ */ package mage.cards.l; -import java.util.UUID; import mage.abilities.effects.common.discard.DiscardCardYouChooseTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; @@ -39,6 +39,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.TargetPlayer; +import java.util.UUID; + /** * * @author fireshoes @@ -49,7 +51,7 @@ public class LayBareTheHeart extends CardImpl { static { filter.add(Predicates.not(new CardTypePredicate(CardType.LAND))); - filter.add(Predicates.not(new SupertypePredicate("Legendary"))); + filter.add(Predicates.not(new SupertypePredicate(SuperType.LEGENDARY))); } public LayBareTheHeart(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/l/LegionsOfLimDul.java b/Mage.Sets/src/mage/cards/l/LegionsOfLimDul.java index 4c1948b0894..843a84757c0 100644 --- a/Mage.Sets/src/mage/cards/l/LegionsOfLimDul.java +++ b/Mage.Sets/src/mage/cards/l/LegionsOfLimDul.java @@ -27,16 +27,18 @@ */ package mage.cards.l; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.LandwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; +import java.util.UUID; + /** * * @author fireshoes @@ -46,7 +48,7 @@ public class LegionsOfLimDul extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("snow swamp"); static { - filter.add(new SupertypePredicate("Snow")); + filter.add(new SupertypePredicate(SuperType.SNOW)); filter.add(new SubtypePredicate("Swamp")); } diff --git a/Mage.Sets/src/mage/cards/l/Lifespinner.java b/Mage.Sets/src/mage/cards/l/Lifespinner.java index bbd200ca482..76173a3f377 100644 --- a/Mage.Sets/src/mage/cards/l/Lifespinner.java +++ b/Mage.Sets/src/mage/cards/l/Lifespinner.java @@ -27,7 +27,6 @@ */ package mage.cards.l; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -36,6 +35,7 @@ import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterPermanentCard; @@ -44,6 +44,8 @@ import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -53,7 +55,7 @@ public class Lifespinner extends CardImpl { private static final FilterPermanentCard filter = new FilterPermanentCard("legendary Spirit permanent card"); static { - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); filter.add(new SubtypePredicate("Spirit")); } diff --git a/Mage.Sets/src/mage/cards/l/LilianaDefiantNecromancer.java b/Mage.Sets/src/mage/cards/l/LilianaDefiantNecromancer.java index ac433f8daa2..ad87bb63093 100644 --- a/Mage.Sets/src/mage/cards/l/LilianaDefiantNecromancer.java +++ b/Mage.Sets/src/mage/cards/l/LilianaDefiantNecromancer.java @@ -27,7 +27,6 @@ */ package mage.cards.l; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.DiesCreatureTriggeredAbility; @@ -43,10 +42,7 @@ import mage.abilities.effects.common.discard.DiscardEachPlayerEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.Filter; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; @@ -59,6 +55,8 @@ import mage.game.command.Emblem; import mage.target.common.TargetCardInYourGraveyard; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 @@ -68,7 +66,7 @@ public class LilianaDefiantNecromancer extends CardImpl { private static final FilterCreatureCard filter = new FilterCreatureCard("nonlegendary creature with converted mana cost X from your graveyard"); static { - filter.add(Predicates.not(new SupertypePredicate("Legendary"))); + filter.add(Predicates.not(new SupertypePredicate(SuperType.LEGENDARY))); } UUID ability2Id; diff --git a/Mage.Sets/src/mage/cards/l/Lobotomy.java b/Mage.Sets/src/mage/cards/l/Lobotomy.java index 2b5fb885694..ac6f91080e0 100644 --- a/Mage.Sets/src/mage/cards/l/Lobotomy.java +++ b/Mage.Sets/src/mage/cards/l/Lobotomy.java @@ -27,17 +27,13 @@ */ package mage.cards.l; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; @@ -50,6 +46,8 @@ import mage.target.TargetCard; import mage.target.TargetPlayer; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -79,7 +77,7 @@ class LobotomyEffect extends OneShotEffect { private static final FilterCard filter = new FilterCard("card other than a basic land card"); static { - filter.add(Predicates.not(Predicates.and(new CardTypePredicate(CardType.LAND), new SupertypePredicate("Basic")))); + filter.add(Predicates.not(Predicates.and(new CardTypePredicate(CardType.LAND), new SupertypePredicate(SuperType.BASIC)))); } public LobotomyEffect() { diff --git a/Mage.Sets/src/mage/cards/l/LoyalRetainers.java b/Mage.Sets/src/mage/cards/l/LoyalRetainers.java index 8281c286b88..b0b5c76c3de 100644 --- a/Mage.Sets/src/mage/cards/l/LoyalRetainers.java +++ b/Mage.Sets/src/mage/cards/l/LoyalRetainers.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffec import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -52,7 +53,7 @@ public class LoyalRetainers extends CardImpl { private static final FilterCreatureCard filter = new FilterCreatureCard("legendary creature card from your graveyard"); static { - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); } public LoyalRetainers(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheMoon.java b/Mage.Sets/src/mage/cards/m/MagusOfTheMoon.java index b659af86f9e..f141991953a 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheMoon.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheMoon.java @@ -53,7 +53,7 @@ public class MagusOfTheMoon extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(Predicates.not(new SupertypePredicate("Basic"))); + filter.add(Predicates.not(new SupertypePredicate(SuperType.LEGENDARY))); } public MagusOfTheMoon(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/Mirrorweave.java b/Mage.Sets/src/mage/cards/m/Mirrorweave.java index 0d5f5b6c7c3..0765b98cac9 100644 --- a/Mage.Sets/src/mage/cards/m/Mirrorweave.java +++ b/Mage.Sets/src/mage/cards/m/Mirrorweave.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -35,6 +34,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -45,6 +45,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.util.functions.EmptyApplyToPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -54,7 +56,7 @@ public class Mirrorweave extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonlegendary creature"); static { - filter.add(Predicates.not(new SupertypePredicate("Legendary"))); + filter.add(Predicates.not(new SupertypePredicate(SuperType.LEGENDARY))); } public Mirrorweave(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/m/MistveinBorderpost.java b/Mage.Sets/src/mage/cards/m/MistveinBorderpost.java index 38ab7305e3d..d0ef07c1a00 100644 --- a/Mage.Sets/src/mage/cards/m/MistveinBorderpost.java +++ b/Mage.Sets/src/mage/cards/m/MistveinBorderpost.java @@ -28,9 +28,7 @@ package mage.cards.m; -import java.util.UUID; import mage.abilities.Ability; -import mage.constants.CardType; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.common.ReturnToHandChosenControlledPermanentCost; @@ -39,11 +37,15 @@ import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Loki @@ -53,7 +55,7 @@ public class MistveinBorderpost extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("a basic land"); static { - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); } public MistveinBorderpost (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/n/NayaPanorama.java b/Mage.Sets/src/mage/cards/n/NayaPanorama.java index 8d617f45c71..7a670f975cf 100644 --- a/Mage.Sets/src/mage/cards/n/NayaPanorama.java +++ b/Mage.Sets/src/mage/cards/n/NayaPanorama.java @@ -27,10 +27,6 @@ */ package mage.cards.n; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -40,6 +36,10 @@ 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.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -47,6 +47,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author North @@ -58,7 +60,7 @@ public class NayaPanorama extends CardImpl { static { filter.add(new CardTypePredicate(CardType.LAND)); - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); filter.add(Predicates.or( new SubtypePredicate("Mountain"), new SubtypePredicate("Forest"), diff --git a/Mage.Sets/src/mage/cards/n/NissaVastwoodSeer.java b/Mage.Sets/src/mage/cards/n/NissaVastwoodSeer.java index 270e932e044..9d4d28abca9 100644 --- a/Mage.Sets/src/mage/cards/n/NissaVastwoodSeer.java +++ b/Mage.Sets/src/mage/cards/n/NissaVastwoodSeer.java @@ -57,7 +57,7 @@ public class NissaVastwoodSeer extends CardImpl { private static final FilterCard filter = new FilterCard("basic Forest card"); static { - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); filter.add(new SubtypePredicate("Forest")); } diff --git a/Mage.Sets/src/mage/cards/o/OhranYeti.java b/Mage.Sets/src/mage/cards/o/OhranYeti.java index d1d9f79b667..f3c52a8b826 100644 --- a/Mage.Sets/src/mage/cards/o/OhranYeti.java +++ b/Mage.Sets/src/mage/cards/o/OhranYeti.java @@ -54,7 +54,7 @@ public class OhranYeti extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("snow creature"); static { - filter.add(new SupertypePredicate("Snow")); + filter.add(new SupertypePredicate(SuperType.SNOW)); } public OhranYeti(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/o/OkinaTempleToTheGrandfathers.java b/Mage.Sets/src/mage/cards/o/OkinaTempleToTheGrandfathers.java index d62a77c09a4..b000965aa2a 100644 --- a/Mage.Sets/src/mage/cards/o/OkinaTempleToTheGrandfathers.java +++ b/Mage.Sets/src/mage/cards/o/OkinaTempleToTheGrandfathers.java @@ -28,9 +28,6 @@ package mage.cards.o; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -39,10 +36,13 @@ import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * @author Loki */ @@ -51,7 +51,7 @@ public class OkinaTempleToTheGrandfathers extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature"); static { - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); } public OkinaTempleToTheGrandfathers(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/p/PrairieStream.java b/Mage.Sets/src/mage/cards/p/PrairieStream.java index 859efd787dc..df0c62b8f19 100644 --- a/Mage.Sets/src/mage/cards/p/PrairieStream.java +++ b/Mage.Sets/src/mage/cards/p/PrairieStream.java @@ -27,8 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; - import mage.abilities.CountType; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; @@ -41,9 +39,12 @@ import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; +import java.util.UUID; + /** * * @author fireshoes @@ -53,7 +54,7 @@ public class PrairieStream extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); } public PrairieStream(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 0b10b3d0aa1..17f06a52f4b 100644 --- a/Mage.Sets/src/mage/cards/r/RimeDryad.java +++ b/Mage.Sets/src/mage/cards/r/RimeDryad.java @@ -27,16 +27,18 @@ */ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.LandwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; +import java.util.UUID; + /** * * @author fireshoes @@ -46,7 +48,7 @@ public class RimeDryad extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("snow forest"); static { - filter.add(new SupertypePredicate("Snow")); + filter.add(new SupertypePredicate(SuperType.SNOW)); filter.add(new SubtypePredicate("Forest")); } diff --git a/Mage.Sets/src/mage/cards/r/RimeTransfusion.java b/Mage.Sets/src/mage/cards/r/RimeTransfusion.java index 6fb01fcf536..4db901378e9 100644 --- a/Mage.Sets/src/mage/cards/r/RimeTransfusion.java +++ b/Mage.Sets/src/mage/cards/r/RimeTransfusion.java @@ -60,7 +60,7 @@ public class RimeTransfusion extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("except by snow creatures until end of turn"); static { - filter.add(Predicates.not(new SupertypePredicate("Snow"))); + filter.add(Predicates.not(new SupertypePredicate(SuperType.SNOW))); } public RimeTransfusion(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RimewindCryomancer.java b/Mage.Sets/src/mage/cards/r/RimewindCryomancer.java index e67b2fdf7b1..9a96a52a426 100644 --- a/Mage.Sets/src/mage/cards/r/RimewindCryomancer.java +++ b/Mage.Sets/src/mage/cards/r/RimewindCryomancer.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.CountType; @@ -39,11 +38,14 @@ import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetActivatedAbility; +import java.util.UUID; + /** * * @author fireshoes @@ -53,7 +55,7 @@ public class RimewindCryomancer extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("you control four or more snow permanents"); static { - filter.add(new SupertypePredicate("Snow")); + filter.add(new SupertypePredicate(SuperType.SNOW)); } public RimewindCryomancer(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RimewindTaskmage.java b/Mage.Sets/src/mage/cards/r/RimewindTaskmage.java index 36124704fce..b985db5dd04 100644 --- a/Mage.Sets/src/mage/cards/r/RimewindTaskmage.java +++ b/Mage.Sets/src/mage/cards/r/RimewindTaskmage.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.CountType; @@ -39,11 +38,14 @@ import mage.abilities.effects.common.MayTapOrUntapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -53,7 +55,7 @@ public class RimewindTaskmage extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("you control four or more snow permanents"); static { - filter.add(new SupertypePredicate("Snow")); + filter.add(new SupertypePredicate(SuperType.SNOW)); } public RimewindTaskmage(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/r/RonomHulk.java b/Mage.Sets/src/mage/cards/r/RonomHulk.java index 4c6ded58f25..0d3ce044d9f 100644 --- a/Mage.Sets/src/mage/cards/r/RonomHulk.java +++ b/Mage.Sets/src/mage/cards/r/RonomHulk.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CumulativeUpkeepAbility; @@ -35,9 +34,12 @@ import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.SupertypePredicate; +import java.util.UUID; + /** * * @author LoneFox @@ -47,7 +49,7 @@ public class RonomHulk extends CardImpl { private static final FilterCard filter = new FilterCard("snow"); static { - filter.add(new SupertypePredicate("Snow")); + filter.add(new SupertypePredicate(SuperType.SNOW)); } public RonomHulk(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ShinkaTheBloodsoakedKeep.java b/Mage.Sets/src/mage/cards/s/ShinkaTheBloodsoakedKeep.java index e3ad49738c2..dd5d7ced493 100644 --- a/Mage.Sets/src/mage/cards/s/ShinkaTheBloodsoakedKeep.java +++ b/Mage.Sets/src/mage/cards/s/ShinkaTheBloodsoakedKeep.java @@ -28,9 +28,6 @@ package mage.cards.s; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -40,10 +37,13 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * @author Loki */ @@ -52,7 +52,7 @@ public class ShinkaTheBloodsoakedKeep extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature"); static { - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); } public ShinkaTheBloodsoakedKeep(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/ShizoDeathsStorehouse.java b/Mage.Sets/src/mage/cards/s/ShizoDeathsStorehouse.java index 586873b3749..048e855a62c 100644 --- a/Mage.Sets/src/mage/cards/s/ShizoDeathsStorehouse.java +++ b/Mage.Sets/src/mage/cards/s/ShizoDeathsStorehouse.java @@ -28,9 +28,6 @@ package mage.cards.s; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; @@ -40,10 +37,13 @@ import mage.abilities.keyword.FearAbility; import mage.abilities.mana.BlackManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * @author Loki */ @@ -52,7 +52,7 @@ public class ShizoDeathsStorehouse extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature"); static { - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); } public ShizoDeathsStorehouse(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SithRuins.java b/Mage.Sets/src/mage/cards/s/SithRuins.java index 62eb95363be..e123722f666 100644 --- a/Mage.Sets/src/mage/cards/s/SithRuins.java +++ b/Mage.Sets/src/mage/cards/s/SithRuins.java @@ -37,6 +37,7 @@ 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.filter.FilterCard; import mage.filter.predicate.Predicate; @@ -92,7 +93,7 @@ public class SithRuins extends CardImpl { subtypePredicates.add(new SubtypePredicate("Mountain")); subtypePredicates.add(new SubtypePredicate("Island")); filter.add(Predicates.or(subtypePredicates)); - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); TargetCardInLibrary target = new TargetCardInLibrary(filter); addEffect(new SearchLibraryPutInPlayEffect(target, true, true, Outcome.PutLandInPlay)); } diff --git a/Mage.Sets/src/mage/cards/s/Skred.java b/Mage.Sets/src/mage/cards/s/Skred.java index 14c99063f2b..0bb3d6fd64f 100644 --- a/Mage.Sets/src/mage/cards/s/Skred.java +++ b/Mage.Sets/src/mage/cards/s/Skred.java @@ -33,6 +33,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.game.Game; @@ -69,7 +70,7 @@ class SkredDamageEffect extends OneShotEffect { private static final FilterControlledPermanent filter = new FilterControlledPermanent("equal to the number of snow permanents you control."); static { - filter.add(new SupertypePredicate("Snow")); + filter.add(new SupertypePredicate(SuperType.SNOW)); } public SkredDamageEffect() { diff --git a/Mage.Sets/src/mage/cards/s/SquanderedResources.java b/Mage.Sets/src/mage/cards/s/SquanderedResources.java index 89893b24c28..21a2111de64 100644 --- a/Mage.Sets/src/mage/cards/s/SquanderedResources.java +++ b/Mage.Sets/src/mage/cards/s/SquanderedResources.java @@ -27,9 +27,6 @@ */ package mage.cards.s; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.Mana; import mage.abilities.Abilities; import mage.abilities.Ability; @@ -44,6 +41,7 @@ import mage.choices.Choice; import mage.choices.ChoiceColor; import mage.constants.CardType; import mage.constants.ColoredManaSymbol; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; @@ -53,6 +51,10 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledPermanent; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com) @@ -83,7 +85,7 @@ class SquanderedResourcesEffect extends ManaEffect { private static final FilterControlledPermanent filter = new FilterControlledLandPermanent(); static { - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); } public SquanderedResourcesEffect() { diff --git a/Mage.Sets/src/mage/cards/s/StarCompass.java b/Mage.Sets/src/mage/cards/s/StarCompass.java index 1bf4c6f8c93..97de986d414 100644 --- a/Mage.Sets/src/mage/cards/s/StarCompass.java +++ b/Mage.Sets/src/mage/cards/s/StarCompass.java @@ -27,9 +27,6 @@ */ package mage.cards.s; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import mage.Mana; import mage.abilities.Abilities; import mage.abilities.Ability; @@ -43,6 +40,7 @@ import mage.choices.Choice; import mage.choices.ChoiceColor; import mage.constants.CardType; import mage.constants.ColoredManaSymbol; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; @@ -51,6 +49,10 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * * @author anonymous @@ -102,7 +104,7 @@ class StarCompassManaEffect extends ManaEffect { private static final FilterControlledPermanent filter = new FilterControlledLandPermanent(); static { - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); } public StarCompassManaEffect() { diff --git a/Mage.Sets/src/mage/cards/s/SunkenHollow.java b/Mage.Sets/src/mage/cards/s/SunkenHollow.java index d9cd0c0a19a..f6f875e5156 100644 --- a/Mage.Sets/src/mage/cards/s/SunkenHollow.java +++ b/Mage.Sets/src/mage/cards/s/SunkenHollow.java @@ -27,8 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; - import mage.abilities.CountType; import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.condition.Condition; @@ -41,9 +39,12 @@ import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; +import java.util.UUID; + /** * * @author fireshoes @@ -53,7 +54,7 @@ public class SunkenHollow extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent(); static { - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); } public SunkenHollow(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/Sunstone.java b/Mage.Sets/src/mage/cards/s/Sunstone.java index 0500293dff2..a40654b74b2 100644 --- a/Mage.Sets/src/mage/cards/s/Sunstone.java +++ b/Mage.Sets/src/mage/cards/s/Sunstone.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -38,11 +37,14 @@ 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.filter.common.FilterControlledLandPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Quercitron @@ -52,7 +54,7 @@ public class Sunstone extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("a snow land"); static { - filter.add(new SupertypePredicate("Snow")); + filter.add(new SupertypePredicate(SuperType.SNOW)); } public Sunstone(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SurgicalExtraction.java b/Mage.Sets/src/mage/cards/s/SurgicalExtraction.java index 6da76539b66..e9e2b9e2eac 100644 --- a/Mage.Sets/src/mage/cards/s/SurgicalExtraction.java +++ b/Mage.Sets/src/mage/cards/s/SurgicalExtraction.java @@ -27,17 +27,12 @@ */ package mage.cards.s; -import java.util.List; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; @@ -50,6 +45,9 @@ import mage.target.common.TargetCardInGraveyard; import mage.target.common.TargetCardInHand; import mage.target.common.TargetCardInLibrary; +import java.util.List; +import java.util.UUID; + /** * * @author North @@ -59,7 +57,7 @@ public class SurgicalExtraction extends CardImpl { private static final FilterCard filter = new FilterCard("card in a graveyard other than a basic land card"); static { - filter.add(Predicates.not(Predicates.and(new CardTypePredicate(CardType.LAND), new SupertypePredicate("Basic")))); + filter.add(Predicates.not(Predicates.and(new CardTypePredicate(CardType.LAND), new SupertypePredicate(SuperType.BASIC)))); } public SurgicalExtraction(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/s/SwordOfTheChosen.java b/Mage.Sets/src/mage/cards/s/SwordOfTheChosen.java index e819825b9a0..a53ddb4b26e 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfTheChosen.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfTheChosen.java @@ -52,7 +52,7 @@ public class SwordOfTheChosen extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature"); static { - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); } public SwordOfTheChosen(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TenzaGodosMaul.java b/Mage.Sets/src/mage/cards/t/TenzaGodosMaul.java index de02c405e2b..a0b2939c3c1 100644 --- a/Mage.Sets/src/mage/cards/t/TenzaGodosMaul.java +++ b/Mage.Sets/src/mage/cards/t/TenzaGodosMaul.java @@ -49,7 +49,6 @@ import mage.target.common.TargetControlledCreaturePermanent; import java.util.UUID; /** - * * @author LevelX */ @@ -62,20 +61,20 @@ public class TenzaGodosMaul extends CardImpl { private static final FilterCreaturePermanent redFilter = new FilterCreaturePermanent("red"); static { - legendaryFilter.add(new SupertypePredicate("Legendary")); + legendaryFilter.add(new SupertypePredicate(SuperType.LEGENDARY)); redFilter.add(new ColorPredicate(ObjectColor.RED)); } public TenzaGodosMaul(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); addSuperType(SuperType.LEGENDARY); this.subtype.add("Equipment"); // Equipped creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); // As long as it's legendary, it gets an additional +2/+2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new BoostEquippedEffect(2, 2), + new BoostEquippedEffect(2, 2), new AttachedToMatchesFilterCondition(legendaryFilter), rule1))); // As long as it's red, it has trample. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( @@ -93,7 +92,7 @@ public class TenzaGodosMaul extends CardImpl { @Override public TenzaGodosMaul copy() { return new TenzaGodosMaul(this); - } + } } diff --git a/Mage.Sets/src/mage/cards/t/TimeOfNeed.java b/Mage.Sets/src/mage/cards/t/TimeOfNeed.java index 66f9f41c878..f961efbb7a5 100644 --- a/Mage.Sets/src/mage/cards/t/TimeOfNeed.java +++ b/Mage.Sets/src/mage/cards/t/TimeOfNeed.java @@ -28,17 +28,18 @@ package mage.cards.t; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * @author Loki */ @@ -48,7 +49,7 @@ public class TimeOfNeed extends CardImpl { static { filter.add(new CardTypePredicate(CardType.CREATURE)); - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); } public TimeOfNeed(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/t/TsaboTavoc.java b/Mage.Sets/src/mage/cards/t/TsaboTavoc.java index d0f16a65a63..04cf89d8a69 100644 --- a/Mage.Sets/src/mage/cards/t/TsaboTavoc.java +++ b/Mage.Sets/src/mage/cards/t/TsaboTavoc.java @@ -56,8 +56,8 @@ public class TsaboTavoc extends CardImpl { private static final FilterCreaturePermanent filterDestroy = new FilterCreaturePermanent("legendary creature"); static { - filter.add(new SupertypePredicate("Legendary")); - filterDestroy.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); + filterDestroy.add(new SupertypePredicate(SuperType.LEGENDARY)); } public TsaboTavoc(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 163c81824f5..40fd6b2296f 100644 --- a/Mage.Sets/src/mage/cards/u/UnderworldSlums.java +++ b/Mage.Sets/src/mage/cards/u/UnderworldSlums.java @@ -37,6 +37,7 @@ 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.filter.FilterCard; import mage.filter.predicate.Predicate; @@ -92,7 +93,7 @@ public class UnderworldSlums extends CardImpl { subtypePredicates.add(new SubtypePredicate("Mountain")); subtypePredicates.add(new SubtypePredicate("Forest")); filter.add(Predicates.or(subtypePredicates)); - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); TargetCardInLibrary target = new TargetCardInLibrary(filter); addEffect(new SearchLibraryPutInPlayEffect(target, true, true, Outcome.PutLandInPlay)); } diff --git a/Mage.Sets/src/mage/cards/v/VolcanicOffering.java b/Mage.Sets/src/mage/cards/v/VolcanicOffering.java index 2313bd7358f..ec13544e3b0 100644 --- a/Mage.Sets/src/mage/cards/v/VolcanicOffering.java +++ b/Mage.Sets/src/mage/cards/v/VolcanicOffering.java @@ -27,7 +27,6 @@ */ package mage.cards.v; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.SpellAbility; import mage.abilities.effects.OneShotEffect; @@ -35,6 +34,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SuperType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterLandPermanent; @@ -48,6 +48,8 @@ import mage.players.Player; import mage.target.TargetPermanent; import mage.target.common.TargetOpponentsChoicePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -58,7 +60,7 @@ public class VolcanicOffering extends CardImpl { private static final FilterCreaturePermanent filterCreature = new FilterCreaturePermanent("creature you don't control"); static { filterLand.add(new ControllerPredicate(TargetController.NOT_YOU)); - filterLand.add(Predicates.not(new SupertypePredicate("Basic"))); + filterLand.add(Predicates.not(new SupertypePredicate(SuperType.BASIC))); filterCreature.add(new ControllerPredicate(TargetController.NOT_YOU)); } public VolcanicOffering(UUID ownerId, CardSetInfo setInfo) { @@ -84,7 +86,7 @@ public class VolcanicOffering extends CardImpl { ability.getTargets().clear(); ability.addTarget(new TargetPermanent(filterLand)); FilterLandPermanent filterLandForOpponent = new FilterLandPermanent("nonbasic land not controlled by " + controller.getLogName()); - filterLandForOpponent.add(Predicates.not(new SupertypePredicate("Basic"))); + filterLandForOpponent.add(Predicates.not(new SupertypePredicate(SuperType.BASIC))); filterLandForOpponent.add(Predicates.not(new ControllerIdPredicate(controller.getId()))); ability.addTarget(new TargetOpponentsChoicePermanent(1, 1, filterLandForOpponent, false, true)); diff --git a/Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java b/Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java index f62aeb67db9..b91eb925cac 100644 --- a/Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java +++ b/Mage.Sets/src/mage/cards/v/VolrathsShapeshifter.java @@ -116,7 +116,7 @@ class VolrathsShapeshifterEffect extends ContinuousEffectImpl { permanent.getSuperType().clear(); for (SuperType type : card.getSuperType()) { - permanent.getSuperType().add(type); + permanent.addSuperType(type); } diff --git a/Mage.Sets/src/mage/cards/w/WaveOfVitriol.java b/Mage.Sets/src/mage/cards/w/WaveOfVitriol.java index 82194f7b133..d190a207214 100644 --- a/Mage.Sets/src/mage/cards/w/WaveOfVitriol.java +++ b/Mage.Sets/src/mage/cards/w/WaveOfVitriol.java @@ -27,11 +27,6 @@ */ package mage.cards.w; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.Map; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -40,6 +35,7 @@ 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.filter.FilterPermanent; import mage.filter.common.FilterBasicLandCard; @@ -51,6 +47,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.*; + /** * * @author LevelX2 @@ -85,7 +83,7 @@ class WaveOfVitriolEffect extends OneShotEffect { new CardTypePredicate(CardType.ENCHANTMENT), Predicates.and( new CardTypePredicate(CardType.LAND), - Predicates.not(new SupertypePredicate("Basic")) + Predicates.not(new SupertypePredicate(SuperType.BASIC)) ) )); } diff --git a/Mage.Sets/src/mage/cards/w/Whiteout.java b/Mage.Sets/src/mage/cards/w/Whiteout.java index 4023cba90d5..8dbb1648801 100644 --- a/Mage.Sets/src/mage/cards/w/Whiteout.java +++ b/Mage.Sets/src/mage/cards/w/Whiteout.java @@ -27,7 +27,6 @@ */ package mage.cards.w; -import java.util.UUID; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.effects.Effect; @@ -38,12 +37,15 @@ 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.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -53,7 +55,7 @@ public class Whiteout extends CardImpl { private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("a snow land"); static { - filter.add(new SupertypePredicate("Snow")); + filter.add(new SupertypePredicate(SuperType.SNOW)); } public Whiteout(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WildernessElemental.java b/Mage.Sets/src/mage/cards/w/WildernessElemental.java index 4cabdd32755..3838a628998 100644 --- a/Mage.Sets/src/mage/cards/w/WildernessElemental.java +++ b/Mage.Sets/src/mage/cards/w/WildernessElemental.java @@ -27,7 +27,6 @@ */ package mage.cards.w; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; @@ -35,15 +34,14 @@ import mage.abilities.effects.common.continuous.SetPowerSourceEffect; 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.FilterLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.filter.predicate.permanent.ControllerPredicate; +import java.util.UUID; + /** * * @author LoneFox @@ -53,7 +51,7 @@ public class WildernessElemental extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent("nonbasic lands your opponents control"); static { - filter.add(Predicates.not(new SupertypePredicate("Basic"))); + filter.add(Predicates.not(new SupertypePredicate(SuperType.BASIC))); filter.add(new ControllerPredicate(TargetController.OPPONENT)); } diff --git a/Mage.Sets/src/mage/cards/w/WildfieldBorderpost.java b/Mage.Sets/src/mage/cards/w/WildfieldBorderpost.java index 9b43932cf2e..85fa05d7e04 100644 --- a/Mage.Sets/src/mage/cards/w/WildfieldBorderpost.java +++ b/Mage.Sets/src/mage/cards/w/WildfieldBorderpost.java @@ -28,9 +28,7 @@ package mage.cards.w; -import java.util.UUID; import mage.abilities.Ability; -import mage.constants.CardType; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.common.ReturnToHandChosenControlledPermanentCost; @@ -39,11 +37,15 @@ import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SuperType; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author Loki @@ -53,7 +55,7 @@ public class WildfieldBorderpost extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("a basic land"); static { - filter.add(new SupertypePredicate("Basic")); + filter.add(new SupertypePredicate(SuperType.BASIC)); } public WildfieldBorderpost (UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WillowSatyr.java b/Mage.Sets/src/mage/cards/w/WillowSatyr.java index 1ed358b37e1..5d3b86bb1a0 100644 --- a/Mage.Sets/src/mage/cards/w/WillowSatyr.java +++ b/Mage.Sets/src/mage/cards/w/WillowSatyr.java @@ -27,7 +27,6 @@ */ package mage.cards.w; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -42,11 +41,14 @@ 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.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -56,7 +58,7 @@ public class WillowSatyr extends CardImpl { private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature"); static { - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); } public WillowSatyr(UUID ownerId, CardSetInfo setInfo) { diff --git a/Mage.Sets/src/mage/cards/w/WoodlandBellower.java b/Mage.Sets/src/mage/cards/w/WoodlandBellower.java index 84b0cfac0a7..5f186fa00aa 100644 --- a/Mage.Sets/src/mage/cards/w/WoodlandBellower.java +++ b/Mage.Sets/src/mage/cards/w/WoodlandBellower.java @@ -27,7 +27,6 @@ */ package mage.cards.w; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -38,6 +37,7 @@ 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.filter.Filter; import mage.filter.FilterCard; @@ -50,6 +50,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.UUID; + /** * * @author fireshoes @@ -96,7 +98,7 @@ class WoodlandBellowerEffect extends OneShotEffect { FilterCard filter = new FilterCard("nonlegendary green creature card with converted mana cost 3 or less"); filter.add(new ColorPredicate(ObjectColor.GREEN)); filter.add(new CardTypePredicate(CardType.CREATURE)); - filter.add(Predicates.not(new SupertypePredicate("Legendary"))); + filter.add(Predicates.not(new SupertypePredicate(SuperType.LEGENDARY))); filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.LessThan, 4)); TargetCardInLibrary target = new TargetCardInLibrary(filter); if (controller.searchLibrary(target, game)) { diff --git a/Mage.Sets/src/mage/cards/y/YomijiWhoBarsTheWay.java b/Mage.Sets/src/mage/cards/y/YomijiWhoBarsTheWay.java index b707816d037..226c33f8241 100644 --- a/Mage.Sets/src/mage/cards/y/YomijiWhoBarsTheWay.java +++ b/Mage.Sets/src/mage/cards/y/YomijiWhoBarsTheWay.java @@ -27,7 +27,6 @@ */ package mage.cards.y; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.PutIntoGraveFromBattlefieldAllTriggeredAbility; import mage.abilities.effects.Effect; @@ -40,6 +39,8 @@ import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import java.util.UUID; + /** * * @author LevelX2 @@ -57,7 +58,7 @@ public class YomijiWhoBarsTheWay extends CardImpl { // Whenever a legendary permanent other than Yomiji, Who Bars the Way is put into a graveyard from the battlefield, return that card to its owner's hand. FilterPermanent filter = new FilterPermanent("a legendary permanent other than " + getName()); filter.add(new AnotherPredicate()); - filter.add(new SupertypePredicate("Legendary")); + filter.add(new SupertypePredicate(SuperType.LEGENDARY)); Effect effect = new ReturnToHandTargetEffect(); effect.setText("return that card to its owner's hand"); this.addAbility(new PutIntoGraveFromBattlefieldAllTriggeredAbility(effect, false, filter, true)); diff --git a/Mage/src/main/java/mage/abilities/effects/common/CopyEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CopyEffect.java index c70164c8573..d57ffbce5c7 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CopyEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CopyEffect.java @@ -27,7 +27,6 @@ */ package mage.abilities.effects.common; -import java.util.UUID; import mage.MageObject; import mage.MageObjectReference; import mage.abilities.Ability; @@ -40,6 +39,8 @@ import mage.game.permanent.PermanentCard; import mage.game.permanent.PermanentToken; import mage.util.functions.ApplyToPermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com @@ -130,7 +131,7 @@ public class CopyEffect extends ContinuousEffectImpl { } permanent.getSuperType().clear(); for (SuperType type : copyFromObject.getSuperType()) { - permanent.getSuperType().add(type); + permanent.addSuperType(type); } permanent.removeAllAbilities(source.getSourceId(), game); diff --git a/Mage/src/main/java/mage/abilities/effects/common/CopyTokenEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CopyTokenEffect.java index 026854d6ef4..66e162eedf1 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CopyTokenEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CopyTokenEffect.java @@ -36,7 +36,7 @@ public class CopyTokenEffect extends ContinuousEffectImpl { } permanent.getSuperType().clear(); for (SuperType type: token.getSuperType()) { - permanent.getSuperType().add(type); + permanent.addSuperType(type); } permanent.getAbilities().clear(); for (Ability ability: token.getAbilities()) { diff --git a/Mage/src/main/java/mage/abilities/keyword/TransformAbility.java b/Mage/src/main/java/mage/abilities/keyword/TransformAbility.java index c769de9ca0a..2d592dc32b3 100644 --- a/Mage/src/main/java/mage/abilities/keyword/TransformAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/TransformAbility.java @@ -85,7 +85,7 @@ public class TransformAbility extends SimpleStaticAbility { } permanent.getSuperType().clear(); for (SuperType type : sourceCard.getSuperType()) { - permanent.getSuperType().add(type); + permanent.addSuperType(type); } permanent.setExpansionSetCode(sourceCard.getExpansionSetCode()); permanent.getAbilities().clear(); diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/SupertypePredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/SupertypePredicate.java index 59d94f41fc0..1622537a034 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/SupertypePredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/SupertypePredicate.java @@ -44,10 +44,6 @@ public class SupertypePredicate implements Predicate { this.supertype = supertype; } - public SupertypePredicate(String supertype){ - this.supertype = SuperType.valueOf(supertype.trim().toUpperCase()); - } - @Override public boolean apply(MageObject input, Game game) { return input.getSuperType().contains(supertype); diff --git a/Mage/src/main/java/mage/util/functions/CopyTokenFunction.java b/Mage/src/main/java/mage/util/functions/CopyTokenFunction.java index 2d1ad62b7fc..57dce0835cf 100644 --- a/Mage/src/main/java/mage/util/functions/CopyTokenFunction.java +++ b/Mage/src/main/java/mage/util/functions/CopyTokenFunction.java @@ -101,7 +101,7 @@ public class CopyTokenFunction implements Function { } target.getSuperType().clear(); for (SuperType type : sourceObj.getSuperType()) { - target.getSuperType().add(type); + target.addSuperType(type); } target.getAbilities().clear();