From be062e8b287750a248719b036389c5edf48e54ba Mon Sep 17 00:00:00 2001 From: igoudt Date: Tue, 18 Jul 2017 08:54:44 +0200 Subject: [PATCH 1/3] remove arcane subtype from Curse of the Cabal --- Mage.Sets/src/mage/cards/c/CurseOfTheCabal.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Mage.Sets/src/mage/cards/c/CurseOfTheCabal.java b/Mage.Sets/src/mage/cards/c/CurseOfTheCabal.java index fa1cb57be5e..28fbfeb82f5 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfTheCabal.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfTheCabal.java @@ -27,20 +27,15 @@ */ package mage.cards.c; -import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.common.SuspendedCondition; import mage.abilities.costs.Cost; -import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.dynamicvalue.common.StaticValue; -import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.SuspendAbility; import mage.cards.CardImpl; @@ -50,7 +45,6 @@ import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; -import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledPermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -59,6 +53,8 @@ import mage.target.Target; import mage.target.TargetPlayer; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author anonymous @@ -67,8 +63,6 @@ public class CurseOfTheCabal extends CardImpl { public CurseOfTheCabal(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{9}{B}"); - this.subtype.add("Arcane"); - // Target player sacrifices half the permanents he or she controls, rounded down. this.getSpellAbility().addTarget(new TargetPlayer()); From 105f346ebc2e44dcb815392226357a22954b4ae5 Mon Sep 17 00:00:00 2001 From: igoudt Date: Tue, 18 Jul 2017 08:55:40 +0200 Subject: [PATCH 2/3] subtypes for cards 'A' --- Mage.Sets/src/mage/cards/a/AAT1.java | 5 +++-- Mage.Sets/src/mage/cards/a/ATST.java | 4 ++-- Mage.Sets/src/mage/cards/a/AWing.java | 5 +++-- Mage.Sets/src/mage/cards/a/AbattoirGhoul.java | 3 ++- Mage.Sets/src/mage/cards/a/AbbeyGargoyles.java | 3 ++- Mage.Sets/src/mage/cards/a/AbbeyGriffin.java | 3 ++- Mage.Sets/src/mage/cards/a/AbbeyMatron.java | 5 +++-- Mage.Sets/src/mage/cards/a/AbbotOfKeralKeep.java | 9 +++------ Mage.Sets/src/mage/cards/a/Abduction.java | 3 ++- Mage.Sets/src/mage/cards/a/AberrantResearcher.java | 9 +++------ Mage.Sets/src/mage/cards/a/AbhorrentOverlord.java | 5 +++-- .../src/mage/cards/a/AbolisherOfBloodlines.java | 5 +++-- Mage.Sets/src/mage/cards/a/Abomination.java | 3 ++- Mage.Sets/src/mage/cards/a/AbominationOfGudul.java | 3 ++- Mage.Sets/src/mage/cards/a/Aboroth.java | 3 ++- .../src/mage/cards/a/AboshanCephalidEmperor.java | 2 +- Mage.Sets/src/mage/cards/a/AboshansDesire.java | 2 +- Mage.Sets/src/mage/cards/a/AbsolverThrull.java | 5 +++-- Mage.Sets/src/mage/cards/a/AbuJafar.java | 3 ++- Mage.Sets/src/mage/cards/a/AbunaAcolyte.java | 5 +++-- Mage.Sets/src/mage/cards/a/AbundantGrowth.java | 7 ++----- Mage.Sets/src/mage/cards/a/AbundantMaw.java | 5 +++-- Mage.Sets/src/mage/cards/a/AbyssalGatekeeper.java | 3 ++- Mage.Sets/src/mage/cards/a/AbyssalHorror.java | 3 ++- Mage.Sets/src/mage/cards/a/AbyssalHunter.java | 5 +++-- .../src/mage/cards/a/AbyssalNightstalker.java | 3 ++- Mage.Sets/src/mage/cards/a/AbyssalNocturnus.java | 3 ++- Mage.Sets/src/mage/cards/a/AbyssalPersecutor.java | 7 ++----- Mage.Sets/src/mage/cards/a/AbyssalSpecter.java | 3 ++- Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java | 9 +++------ Mage.Sets/src/mage/cards/a/AbzanBeastmaster.java | 5 +++-- Mage.Sets/src/mage/cards/a/AbzanFalconer.java | 4 ++-- Mage.Sets/src/mage/cards/a/AbzanGuide.java | 5 +++-- Mage.Sets/src/mage/cards/a/AbzanKinGuard.java | 5 +++-- Mage.Sets/src/mage/cards/a/AbzanRunemark.java | 2 +- Mage.Sets/src/mage/cards/a/AbzanSkycaptain.java | 5 +++-- Mage.Sets/src/mage/cards/a/AcademyElite.java | 5 +++-- Mage.Sets/src/mage/cards/a/AcademyRaider.java | 5 +++-- Mage.Sets/src/mage/cards/a/AcademyRector.java | 5 +++-- Mage.Sets/src/mage/cards/a/AcademyResearchers.java | 4 ++-- .../src/mage/cards/a/AccomplishedAutomaton.java | 3 ++- Mage.Sets/src/mage/cards/a/AccorderPaladin.java | 5 +++-- Mage.Sets/src/mage/cards/a/AccordersShield.java | 7 ++----- Mage.Sets/src/mage/cards/a/AccursedCentaur.java | 5 +++-- Mage.Sets/src/mage/cards/a/AccursedHorde.java | 5 +++-- Mage.Sets/src/mage/cards/a/AccursedSpirit.java | 3 ++- Mage.Sets/src/mage/cards/a/AccursedWitch.java | 4 ++-- Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java | 2 +- Mage.Sets/src/mage/cards/a/AcidWebSpider.java | 2 +- Mage.Sets/src/mage/cards/a/AcidicSlime.java | 3 ++- Mage.Sets/src/mage/cards/a/AcidicSliver.java | 3 ++- Mage.Sets/src/mage/cards/a/AcklayOfTheArena.java | 5 +++-- .../src/mage/cards/a/AcolyteOfTheInferno.java | 5 +++-- Mage.Sets/src/mage/cards/a/AcolyteOfXathrid.java | 5 +++-- Mage.Sets/src/mage/cards/a/Acridian.java | 3 ++- .../src/mage/cards/a/AdamaroFirstToDesire.java | 7 ++----- Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java | 2 +- Mage.Sets/src/mage/cards/a/AdaptiveSnapjaw.java | 5 +++-- Mage.Sets/src/mage/cards/a/AdarkarSentinel.java | 3 ++- Mage.Sets/src/mage/cards/a/AdarkarValkyrie.java | 2 +- Mage.Sets/src/mage/cards/a/AdarkarWindform.java | 7 ++----- Mage.Sets/src/mage/cards/a/AdderStaffBoggart.java | 5 +++-- Mage.Sets/src/mage/cards/a/AdmiralAckbar.java | 7 ++++--- Mage.Sets/src/mage/cards/a/AdmonitionAngel.java | 3 ++- Mage.Sets/src/mage/cards/a/AdornedPouncer.java | 3 ++- .../src/mage/cards/a/AdrianaCaptainOfTheGuard.java | 9 +++------ Mage.Sets/src/mage/cards/a/AdroitHateflayer.java | 5 +++-- Mage.Sets/src/mage/cards/a/AdunOakenshield.java | 5 +++-- Mage.Sets/src/mage/cards/a/AdvanceScout.java | 11 ++++------- Mage.Sets/src/mage/cards/a/AdvancedHoverguard.java | 3 ++- Mage.Sets/src/mage/cards/a/AdvancedStitchwing.java | 5 +++-- Mage.Sets/src/mage/cards/a/AdventuringGear.java | 3 ++- Mage.Sets/src/mage/cards/a/AdvocateOfTheBeast.java | 4 ++-- Mage.Sets/src/mage/cards/a/AegisAngel.java | 3 ++- Mage.Sets/src/mage/cards/a/AegisAutomaton.java | 3 ++- Mage.Sets/src/mage/cards/a/AegisOfTheGods.java | 5 +++-- Mage.Sets/src/mage/cards/a/AeonChronicler.java | 3 ++- Mage.Sets/src/mage/cards/a/AerathiBerserker.java | 5 +++-- Mage.Sets/src/mage/cards/a/AerialGuide.java | 6 ++++-- Mage.Sets/src/mage/cards/a/AerialModification.java | 2 +- Mage.Sets/src/mage/cards/a/AerialResponder.java | 5 +++-- Mage.Sets/src/mage/cards/a/AerieBowmasters.java | 5 +++-- Mage.Sets/src/mage/cards/a/AerieMystics.java | 9 ++++++--- Mage.Sets/src/mage/cards/a/AerieOuphes.java | 3 ++- Mage.Sets/src/mage/cards/a/AerieWorshippers.java | 8 +++++--- Mage.Sets/src/mage/cards/a/AeronautAdmiral.java | 4 ++-- Mage.Sets/src/mage/cards/a/AeronautTinkerer.java | 5 +++-- Mage.Sets/src/mage/cards/a/AesthirGlider.java | 3 ++- Mage.Sets/src/mage/cards/a/AetherAdept.java | 5 +++-- Mage.Sets/src/mage/cards/a/AetherChaser.java | 5 +++-- Mage.Sets/src/mage/cards/a/AetherFigment.java | 3 ++- Mage.Sets/src/mage/cards/a/AetherHerder.java | 7 ++++--- Mage.Sets/src/mage/cards/a/AetherInspector.java | 5 +++-- Mage.Sets/src/mage/cards/a/AetherMeltdown.java | 2 +- Mage.Sets/src/mage/cards/a/AetherMembrane.java | 3 ++- Mage.Sets/src/mage/cards/a/AetherPoisoner.java | 5 +++-- Mage.Sets/src/mage/cards/a/AetherSwooper.java | 5 +++-- Mage.Sets/src/mage/cards/a/AetherTheorist.java | 5 +++-- Mage.Sets/src/mage/cards/a/AetherbornMarauder.java | 5 +++-- Mage.Sets/src/mage/cards/a/AethergeodeMiner.java | 5 +++-- Mage.Sets/src/mage/cards/a/Aetherling.java | 3 ++- Mage.Sets/src/mage/cards/a/Aethersnipe.java | 3 ++- .../src/mage/cards/a/AethersphereHarvester.java | 3 ++- .../src/mage/cards/a/AethersquallAncient.java | 3 ++- Mage.Sets/src/mage/cards/a/AetherstormRoc.java | 3 ++- .../src/mage/cards/a/AetherstreamLeopard.java | 3 ++- Mage.Sets/src/mage/cards/a/AethertideWhale.java | 3 ++- .../src/mage/cards/a/AethertorchRenegade.java | 5 +++-- Mage.Sets/src/mage/cards/a/AetherwindBasker.java | 3 ++- Mage.Sets/src/mage/cards/a/AffaGuardHound.java | 3 ++- Mage.Sets/src/mage/cards/a/AffaProtector.java | 7 ++++--- Mage.Sets/src/mage/cards/a/AfflictedDeserter.java | 5 +++-- Mage.Sets/src/mage/cards/a/AgadeemOccultist.java | 7 ++++--- Mage.Sets/src/mage/cards/a/AgelessEntity.java | 3 ++- Mage.Sets/src/mage/cards/a/AgentOfErebos.java | 3 ++- Mage.Sets/src/mage/cards/a/AgentOfHorizons.java | 5 +++-- Mage.Sets/src/mage/cards/a/AgentOfMasks.java | 5 +++-- Mage.Sets/src/mage/cards/a/AgentOfShauku.java | 5 +++-- Mage.Sets/src/mage/cards/a/AgentOfStromgald.java | 5 +++-- Mage.Sets/src/mage/cards/a/AgentOfTheFates.java | 5 +++-- Mage.Sets/src/mage/cards/a/Agility.java | 7 ++----- Mage.Sets/src/mage/cards/a/Agoraphobia.java | 3 ++- .../src/mage/cards/a/AgrusKosWojekVeteran.java | 5 +++-- Mage.Sets/src/mage/cards/a/AhnCropChampion.java | 9 +++++---- Mage.Sets/src/mage/cards/a/AhnCropCrasher.java | 8 +++++--- Mage.Sets/src/mage/cards/a/AinokArtillerist.java | 5 +++-- Mage.Sets/src/mage/cards/a/AinokBondKin.java | 9 +++------ Mage.Sets/src/mage/cards/a/AinokGuide.java | 5 +++-- Mage.Sets/src/mage/cards/a/AinokSurvivalist.java | 5 +++-- Mage.Sets/src/mage/cards/a/AinokTracker.java | 5 +++-- Mage.Sets/src/mage/cards/a/AirElemental.java | 3 ++- Mage.Sets/src/mage/cards/a/AirServant.java | 3 ++- Mage.Sets/src/mage/cards/a/AirdropAeronauts.java | 5 +++-- Mage.Sets/src/mage/cards/a/AirdropCondor.java | 2 +- Mage.Sets/src/mage/cards/a/AislingLeprechaun.java | 3 ++- .../src/mage/cards/a/AjaniCallerOfThePride.java | 3 ++- Mage.Sets/src/mage/cards/a/AjaniGoldmane.java | 4 ++-- .../src/mage/cards/a/AjaniMentorOfHeroes.java | 2 +- Mage.Sets/src/mage/cards/a/AjaniSteadfast.java | 3 ++- Mage.Sets/src/mage/cards/a/AjaniUnyielding.java | 3 ++- .../src/mage/cards/a/AjaniValiantProtector.java | 3 ++- Mage.Sets/src/mage/cards/a/AjaniVengeant.java | 3 ++- Mage.Sets/src/mage/cards/a/AjanisChosen.java | 9 +++------ Mage.Sets/src/mage/cards/a/AjanisComrade.java | 4 ++-- Mage.Sets/src/mage/cards/a/AjanisPridemate.java | 5 +++-- Mage.Sets/src/mage/cards/a/AjanisSunstriker.java | 5 +++-- Mage.Sets/src/mage/cards/a/AkiriLineSlinger.java | 11 ++++------- Mage.Sets/src/mage/cards/a/AkkiAvalanchers.java | 5 +++-- Mage.Sets/src/mage/cards/a/AkkiBlizzardHerder.java | 5 +++-- Mage.Sets/src/mage/cards/a/AkkiCoalflinger.java | 9 +++------ Mage.Sets/src/mage/cards/a/AkkiDrillmaster.java | 5 +++-- Mage.Sets/src/mage/cards/a/AkkiLavarunner.java | 8 ++++---- Mage.Sets/src/mage/cards/a/AkkiRaider.java | 5 +++-- Mage.Sets/src/mage/cards/a/AkkiRockspeaker.java | 5 +++-- Mage.Sets/src/mage/cards/a/AkkiUnderling.java | 9 +++------ Mage.Sets/src/mage/cards/a/AkkiUnderminer.java | 7 ++++--- Mage.Sets/src/mage/cards/a/AkoumBattlesinger.java | 6 +++--- Mage.Sets/src/mage/cards/a/AkoumBoulderfoot.java | 5 +++-- Mage.Sets/src/mage/cards/a/AkoumFirebird.java | 3 ++- Mage.Sets/src/mage/cards/a/AkoumFlameseeker.java | 6 +++--- Mage.Sets/src/mage/cards/a/AkoumHellkite.java | 3 ++- Mage.Sets/src/mage/cards/a/AkoumStonewaker.java | 8 +++++--- Mage.Sets/src/mage/cards/a/AkrasanSquire.java | 5 +++-- Mage.Sets/src/mage/cards/a/AkroanConscriptor.java | 5 +++-- Mage.Sets/src/mage/cards/a/AkroanCrusader.java | 8 +++++--- Mage.Sets/src/mage/cards/a/AkroanHoplite.java | 5 +++-- Mage.Sets/src/mage/cards/a/AkroanHorse.java | 2 +- Mage.Sets/src/mage/cards/a/AkroanJailer.java | 5 +++-- Mage.Sets/src/mage/cards/a/AkroanLineBreaker.java | 5 +++-- Mage.Sets/src/mage/cards/a/AkroanMastiff.java | 3 ++- Mage.Sets/src/mage/cards/a/AkroanPhalanx.java | 5 +++-- Mage.Sets/src/mage/cards/a/AkroanSergeant.java | 5 +++-- Mage.Sets/src/mage/cards/a/AkroanSkyguard.java | 5 +++-- Mage.Sets/src/mage/cards/a/AkromaAngelOfFury.java | 7 ++----- Mage.Sets/src/mage/cards/a/AkromaAngelOfWrath.java | 3 ++- Mage.Sets/src/mage/cards/a/AkromasDevoted.java | 4 ++-- Mage.Sets/src/mage/cards/a/AkronLegionnaire.java | 9 +++------ Mage.Sets/src/mage/cards/a/AkutaBornOfAsh.java | 2 +- Mage.Sets/src/mage/cards/a/AlabasterDragon.java | 3 ++- Mage.Sets/src/mage/cards/a/AlabasterKirin.java | 3 ++- Mage.Sets/src/mage/cards/a/AlabasterLeech.java | 3 ++- Mage.Sets/src/mage/cards/a/AlabasterMage.java | 5 +++-- Mage.Sets/src/mage/cards/a/AlabasterWall.java | 3 ++- Mage.Sets/src/mage/cards/a/AlabornCavalier.java | 5 +++-- Mage.Sets/src/mage/cards/a/AlabornGrenadier.java | 5 +++-- Mage.Sets/src/mage/cards/a/AlabornMusketeer.java | 5 +++-- Mage.Sets/src/mage/cards/a/AlabornTrooper.java | 5 +++-- Mage.Sets/src/mage/cards/a/AlabornVeteran.java | 5 +++-- Mage.Sets/src/mage/cards/a/Aladdin.java | 5 +++-- Mage.Sets/src/mage/cards/a/AlbinoTroll.java | 3 ++- .../src/mage/cards/a/AlchemistsApprentice.java | 5 +++-- Mage.Sets/src/mage/cards/a/AlertShuInfantry.java | 5 +++-- .../src/mage/cards/a/AleshaWhoSmilesAtDeath.java | 10 +++------- Mage.Sets/src/mage/cards/a/AleshasVanguard.java | 5 +++-- Mage.Sets/src/mage/cards/a/AlexiZephyrMage.java | 5 +++-- Mage.Sets/src/mage/cards/a/AlexisCloak.java | 7 ++----- Mage.Sets/src/mage/cards/a/AlgaeGharial.java | 3 ++- .../src/mage/cards/a/AlhammarretHighArbiter.java | 2 +- Mage.Sets/src/mage/cards/a/AliBaba.java | 4 ++-- Mage.Sets/src/mage/cards/a/AliFromCairo.java | 7 ++----- Mage.Sets/src/mage/cards/a/AllIsDust.java | 3 ++- Mage.Sets/src/mage/cards/a/AlleyGrifters.java | 5 +++-- Mage.Sets/src/mage/cards/a/AlleyStrangler.java | 5 +++-- Mage.Sets/src/mage/cards/a/AllosaurusRider.java | 5 +++-- Mage.Sets/src/mage/cards/a/AlloyGolem.java | 3 ++- Mage.Sets/src/mage/cards/a/AlloyMyr.java | 3 ++- Mage.Sets/src/mage/cards/a/AlluringSiren.java | 7 ++----- Mage.Sets/src/mage/cards/a/AlmsBeast.java | 3 ++- Mage.Sets/src/mage/cards/a/AlphaAuthority.java | 2 +- Mage.Sets/src/mage/cards/a/AlphaKavu.java | 2 +- Mage.Sets/src/mage/cards/a/AlphaMyr.java | 3 ++- Mage.Sets/src/mage/cards/a/AlphaStatus.java | 7 ++----- Mage.Sets/src/mage/cards/a/AlphaTyrranax.java | 3 ++- Mage.Sets/src/mage/cards/a/AlpineGrizzly.java | 3 ++- Mage.Sets/src/mage/cards/a/AltacBloodseeker.java | 5 +++-- Mage.Sets/src/mage/cards/a/AltarGolem.java | 3 ++- Mage.Sets/src/mage/cards/a/AlteredEgo.java | 3 ++- Mage.Sets/src/mage/cards/a/AmbassadorLaquatus.java | 5 +++-- Mage.Sets/src/mage/cards/a/AmbassadorOak.java | 5 +++-- .../src/mage/cards/a/AmbitiousAetherborn.java | 5 +++-- Mage.Sets/src/mage/cards/a/AmbuscadeShaman.java | 5 +++-- Mage.Sets/src/mage/cards/a/AmbushCommander.java | 4 ++-- Mage.Sets/src/mage/cards/a/AmbushKrotiq.java | 3 ++- Mage.Sets/src/mage/cards/a/AmbushParty.java | 5 +++-- Mage.Sets/src/mage/cards/a/AmbushViper.java | 3 ++- Mage.Sets/src/mage/cards/a/AmmitEternal.java | 10 ++++++---- Mage.Sets/src/mage/cards/a/AmoeboidChangeling.java | 2 +- Mage.Sets/src/mage/cards/a/AmphinCutthroat.java | 5 +++-- Mage.Sets/src/mage/cards/a/AmphinPathmage.java | 5 +++-- Mage.Sets/src/mage/cards/a/AmprynTactician.java | 5 +++-- Mage.Sets/src/mage/cards/a/AmrouKithkin.java | 3 ++- Mage.Sets/src/mage/cards/a/AmrouScout.java | 6 +++--- Mage.Sets/src/mage/cards/a/AmrouSeekers.java | 5 +++-- Mage.Sets/src/mage/cards/a/Amugaba.java | 3 ++- Mage.Sets/src/mage/cards/a/AnHavvaConstable.java | 2 +- Mage.Sets/src/mage/cards/a/AnaBattlemage.java | 5 +++-- Mage.Sets/src/mage/cards/a/AnaDisciple.java | 9 +++------ Mage.Sets/src/mage/cards/a/AnabaAncestor.java | 4 ++-- Mage.Sets/src/mage/cards/a/AnabaBodyguard.java | 3 ++- Mage.Sets/src/mage/cards/a/AnabaShaman.java | 5 +++-- Mage.Sets/src/mage/cards/a/AnabaSpiritCrafter.java | 4 ++-- Mage.Sets/src/mage/cards/a/Anaconda.java | 3 ++- .../src/mage/cards/a/AnafenzaKinTreeSpirit.java | 5 +++-- .../src/mage/cards/a/AnafenzaTheForemost.java | 4 ++-- Mage.Sets/src/mage/cards/a/AnakinSkywalker.java | 7 ++++--- Mage.Sets/src/mage/cards/a/Anarchist.java | 5 +++-- Mage.Sets/src/mage/cards/a/Anathemancer.java | 5 +++-- Mage.Sets/src/mage/cards/a/Anavolver.java | 3 ++- Mage.Sets/src/mage/cards/a/AnaxAndCymede.java | 5 +++-- Mage.Sets/src/mage/cards/a/AncestorsChosen.java | 5 +++-- Mage.Sets/src/mage/cards/a/AncestorsProphet.java | 4 ++-- Mage.Sets/src/mage/cards/a/AncestralMask.java | 7 ++----- Mage.Sets/src/mage/cards/a/AncestralStatue.java | 3 ++- Mage.Sets/src/mage/cards/a/AncestralVengeance.java | 7 ++----- Mage.Sets/src/mage/cards/a/AncientCarp.java | 3 ++- Mage.Sets/src/mage/cards/a/AncientCrab.java | 3 ++- Mage.Sets/src/mage/cards/a/AncientHellkite.java | 3 ++- Mage.Sets/src/mage/cards/a/AncientHydra.java | 3 ++- Mage.Sets/src/mage/cards/a/AncientKavu.java | 3 ++- .../src/mage/cards/a/AncientOfTheEquinox.java | 3 ++- Mage.Sets/src/mage/cards/a/AncientOoze.java | 3 ++- Mage.Sets/src/mage/cards/a/AncientSilverback.java | 3 ++- Mage.Sets/src/mage/cards/a/AncientSpider.java | 3 ++- Mage.Sets/src/mage/cards/a/AndraditeLeech.java | 3 ++- .../src/mage/cards/a/AngelOfCondemnation.java | 6 ++++-- Mage.Sets/src/mage/cards/a/AngelOfDeliverance.java | 3 ++- Mage.Sets/src/mage/cards/a/AngelOfDespair.java | 3 ++- Mage.Sets/src/mage/cards/a/AngelOfFinality.java | 3 ++- .../src/mage/cards/a/AngelOfFlightAlabaster.java | 2 +- Mage.Sets/src/mage/cards/a/AngelOfFury.java | 3 ++- Mage.Sets/src/mage/cards/a/AngelOfGlorysRise.java | 2 +- Mage.Sets/src/mage/cards/a/AngelOfInvention.java | 3 ++- Mage.Sets/src/mage/cards/a/AngelOfJubilation.java | 2 +- Mage.Sets/src/mage/cards/a/AngelOfLight.java | 3 ++- Mage.Sets/src/mage/cards/a/AngelOfMercy.java | 3 ++- Mage.Sets/src/mage/cards/a/AngelOfRenewal.java | 5 +++-- Mage.Sets/src/mage/cards/a/AngelOfRetribution.java | 3 ++- Mage.Sets/src/mage/cards/a/AngelOfSalvation.java | 3 ++- Mage.Sets/src/mage/cards/a/AngelOfSanctions.java | 8 +++++--- Mage.Sets/src/mage/cards/a/AngelOfSerenity.java | 3 ++- Mage.Sets/src/mage/cards/a/AngelOfTheDireHour.java | 3 ++- .../src/mage/cards/a/AngelOfTheGodPharaoh.java | 8 +++++--- Mage.Sets/src/mage/cards/a/AngelfireCrusader.java | 11 ++++------- Mage.Sets/src/mage/cards/a/AngelicArbiter.java | 2 +- Mage.Sets/src/mage/cards/a/AngelicArmaments.java | 4 ++-- Mage.Sets/src/mage/cards/a/AngelicCaptain.java | 4 ++-- Mage.Sets/src/mage/cards/a/AngelicCurator.java | 5 +++-- Mage.Sets/src/mage/cards/a/AngelicDestiny.java | 4 ++-- .../src/mage/cards/a/AngelicFieldMarshal.java | 3 ++- Mage.Sets/src/mage/cards/a/AngelicGift.java | 7 ++----- Mage.Sets/src/mage/cards/a/AngelicOverseer.java | 2 +- Mage.Sets/src/mage/cards/a/AngelicPage.java | 5 +++-- Mage.Sets/src/mage/cards/a/AngelicProtector.java | 3 ++- Mage.Sets/src/mage/cards/a/AngelicSkirmisher.java | 7 ++----- Mage.Sets/src/mage/cards/a/AngelicWall.java | 3 ++- Mage.Sets/src/mage/cards/a/AngelsHerald.java | 5 +++-- Mage.Sets/src/mage/cards/a/AngelsTomb.java | 3 ++- Mage.Sets/src/mage/cards/a/Anger.java | 2 +- Mage.Sets/src/mage/cards/a/AnglerDrake.java | 6 ++++-- Mage.Sets/src/mage/cards/a/AngryMob.java | 2 +- Mage.Sets/src/mage/cards/a/AngusMackenzie.java | 4 ++-- Mage.Sets/src/mage/cards/a/AnimalBoneyard.java | 2 +- .../src/mage/cards/a/AnimarSoulOfElements.java | 2 +- Mage.Sets/src/mage/cards/a/AnimateArtifact.java | 2 +- Mage.Sets/src/mage/cards/a/AnimateDead.java | 2 +- Mage.Sets/src/mage/cards/a/AnimateWall.java | 2 +- Mage.Sets/src/mage/cards/a/AnkleShanker.java | 5 +++-- Mage.Sets/src/mage/cards/a/Annex.java | 3 ++- Mage.Sets/src/mage/cards/a/AnodetLurker.java | 3 ++- .../src/mage/cards/a/AnointerOfChampions.java | 5 +++-- Mage.Sets/src/mage/cards/a/AnointerPriest.java | 8 +++++--- Mage.Sets/src/mage/cards/a/AnowonTheRuinSage.java | 4 ++-- Mage.Sets/src/mage/cards/a/AntQueen.java | 3 ++- .../src/mage/cards/a/AnthousaSetessanHero.java | 7 ++++--- Mage.Sets/src/mage/cards/a/Anthroplasm.java | 3 ++- Mage.Sets/src/mage/cards/a/AntlerSkulkin.java | 3 ++- Mage.Sets/src/mage/cards/a/AnuridBarkripper.java | 9 +++------ Mage.Sets/src/mage/cards/a/AnuridBrushhopper.java | 5 +++-- Mage.Sets/src/mage/cards/a/AnuridMurkdiver.java | 7 ++++--- Mage.Sets/src/mage/cards/a/AnuridSwarmsnapper.java | 5 +++-- Mage.Sets/src/mage/cards/a/AnvilwroughtRaptor.java | 3 ++- Mage.Sets/src/mage/cards/a/AnyaMercilessAngel.java | 7 ++----- Mage.Sets/src/mage/cards/a/ApesOfRath.java | 3 ++- Mage.Sets/src/mage/cards/a/ApexHawks.java | 3 ++- Mage.Sets/src/mage/cards/a/AphettoAlchemist.java | 5 +++-- Mage.Sets/src/mage/cards/a/AphettoGrifter.java | 4 ++-- Mage.Sets/src/mage/cards/a/AphettoRunecaster.java | 5 +++-- Mage.Sets/src/mage/cards/a/ApocalypseDemon.java | 10 ++++------ Mage.Sets/src/mage/cards/a/ApocalypseHydra.java | 3 ++- Mage.Sets/src/mage/cards/a/ApothecaryGeist.java | 2 +- Mage.Sets/src/mage/cards/a/ApothecaryInitiate.java | 5 +++-- .../src/mage/cards/a/ApprenticeNecromancer.java | 4 ++-- Mage.Sets/src/mage/cards/a/ApprenticeSorcerer.java | 5 +++-- Mage.Sets/src/mage/cards/a/ApprenticeWizard.java | 5 +++-- .../src/mage/cards/a/AqualishBountyHunter.java | 5 +++-- Mage.Sets/src/mage/cards/a/Aquamoeba.java | 5 +++-- Mage.Sets/src/mage/cards/a/AquamorphEntity.java | 2 +- Mage.Sets/src/mage/cards/a/AquastrandSpider.java | 5 +++-- Mage.Sets/src/mage/cards/a/AqueousForm.java | 7 ++----- Mage.Sets/src/mage/cards/a/AquitectsWill.java | 2 +- Mage.Sets/src/mage/cards/a/AquusSteed.java | 3 ++- Mage.Sets/src/mage/cards/a/ArabaMothrider.java | 5 +++-- Mage.Sets/src/mage/cards/a/Arachnoid.java | 3 ++- Mage.Sets/src/mage/cards/a/ArachnusSpinner.java | 2 +- Mage.Sets/src/mage/cards/a/ArachnusWeb.java | 8 ++------ Mage.Sets/src/mage/cards/a/AradaraExpress.java | 3 ++- .../src/mage/cards/a/ArashiTheSkyAsunder.java | 3 ++- Mage.Sets/src/mage/cards/a/ArashinCleric.java | 5 +++-- Mage.Sets/src/mage/cards/a/ArashinForemost.java | 4 ++-- Mage.Sets/src/mage/cards/a/ArashinSovereign.java | 3 ++- Mage.Sets/src/mage/cards/a/ArashinWarBeast.java | 3 ++- Mage.Sets/src/mage/cards/a/ArbalestElite.java | 5 +++-- .../src/mage/cards/a/ArbiterOfKnollridge.java | 5 +++-- Mage.Sets/src/mage/cards/a/ArbiterOfTheIdeal.java | 7 ++----- Mage.Sets/src/mage/cards/a/ArborColossus.java | 3 ++- Mage.Sets/src/mage/cards/a/ArborElf.java | 4 ++-- Mage.Sets/src/mage/cards/a/ArborbackStomper.java | 3 ++- Mage.Sets/src/mage/cards/a/ArcMage.java | 5 +++-- Mage.Sets/src/mage/cards/a/ArcRunner.java | 5 +++-- Mage.Sets/src/mage/cards/a/ArcSlogger.java | 3 ++- Mage.Sets/src/mage/cards/a/ArcadesSabboth.java | 4 ++-- Mage.Sets/src/mage/cards/a/ArcaneTeachings.java | 2 +- .../src/mage/cards/a/ArcanisTheOmnipotent.java | 3 ++- Mage.Sets/src/mage/cards/a/ArcanumWings.java | 7 ++----- Mage.Sets/src/mage/cards/a/ArcboundBruiser.java | 3 ++- Mage.Sets/src/mage/cards/a/ArcboundCrusher.java | 3 ++- Mage.Sets/src/mage/cards/a/ArcboundHybrid.java | 3 ++- Mage.Sets/src/mage/cards/a/ArcboundLancer.java | 3 ++- Mage.Sets/src/mage/cards/a/ArcboundOverseer.java | 3 ++- Mage.Sets/src/mage/cards/a/ArcboundRavager.java | 3 ++- Mage.Sets/src/mage/cards/a/ArcboundReclaimer.java | 3 ++- Mage.Sets/src/mage/cards/a/ArcboundSlith.java | 3 ++- Mage.Sets/src/mage/cards/a/ArcboundStinger.java | 3 ++- Mage.Sets/src/mage/cards/a/ArcboundWanderer.java | 3 ++- Mage.Sets/src/mage/cards/a/ArcboundWorker.java | 3 ++- Mage.Sets/src/mage/cards/a/Archaeomancer.java | 5 +++-- Mage.Sets/src/mage/cards/a/Archangel.java | 3 ++- Mage.Sets/src/mage/cards/a/ArchangelAvacyn.java | 2 +- Mage.Sets/src/mage/cards/a/ArchangelOfStrife.java | 7 ++----- Mage.Sets/src/mage/cards/a/ArchangelOfThune.java | 3 ++- Mage.Sets/src/mage/cards/a/ArchangelOfTithes.java | 3 ++- Mage.Sets/src/mage/cards/a/ArchdemonOfGreed.java | 2 +- Mage.Sets/src/mage/cards/a/ArchdemonOfUnx.java | 2 +- Mage.Sets/src/mage/cards/a/ArchersOfQarsi.java | 5 +++-- Mage.Sets/src/mage/cards/a/ArchersParapet.java | 3 ++- .../src/mage/cards/a/ArchetypeOfAggression.java | 9 +++------ Mage.Sets/src/mage/cards/a/ArchetypeOfCourage.java | 9 +++------ .../src/mage/cards/a/ArchetypeOfEndurance.java | 7 ++----- .../src/mage/cards/a/ArchetypeOfFinality.java | 7 ++----- .../src/mage/cards/a/ArchetypeOfImagination.java | 9 +++------ .../src/mage/cards/a/ArchfiendOfDepravity.java | 3 ++- Mage.Sets/src/mage/cards/a/ArchfiendOfIfnir.java | 8 +++++--- .../src/mage/cards/a/ArchitectOfTheUntamed.java | 10 ++++++---- Mage.Sets/src/mage/cards/a/ArchitectsOfWill.java | 5 +++-- Mage.Sets/src/mage/cards/a/ArchiveTrap.java | 3 ++- Mage.Sets/src/mage/cards/a/Archivist.java | 5 +++-- Mage.Sets/src/mage/cards/a/ArchonOfJustice.java | 3 ++- Mage.Sets/src/mage/cards/a/ArchonOfRedemption.java | 3 ++- .../src/mage/cards/a/ArchonOfTheTriumvirate.java | 3 ++- Mage.Sets/src/mage/cards/a/Archweaver.java | 3 ++- Mage.Sets/src/mage/cards/a/ArchwingDragon.java | 3 ++- Mage.Sets/src/mage/cards/a/ArcticAven.java | 4 ++-- Mage.Sets/src/mage/cards/a/ArcticMerfolk.java | 3 ++- Mage.Sets/src/mage/cards/a/ArcticWolves.java | 3 ++- Mage.Sets/src/mage/cards/a/ArcumDagsson.java | 9 +++------ Mage.Sets/src/mage/cards/a/ArdentMilitia.java | 5 +++-- Mage.Sets/src/mage/cards/a/ArdentRecruit.java | 9 +++------ Mage.Sets/src/mage/cards/a/ArdentSoldier.java | 5 +++-- Mage.Sets/src/mage/cards/a/ArenaAthlete.java | 3 ++- Mage.Sets/src/mage/cards/a/ArgentSphinx.java | 7 ++----- Mage.Sets/src/mage/cards/a/ArgentumArmor.java | 3 ++- .../src/mage/cards/a/ArgivianArchaeologist.java | 5 +++-- Mage.Sets/src/mage/cards/a/ArgivianBlacksmith.java | 5 +++-- Mage.Sets/src/mage/cards/a/ArgothianElder.java | 5 +++-- .../src/mage/cards/a/ArgothianEnchantress.java | 5 +++-- Mage.Sets/src/mage/cards/a/ArgothianPixies.java | 3 ++- Mage.Sets/src/mage/cards/a/ArgothianSwine.java | 3 ++- Mage.Sets/src/mage/cards/a/ArgothianTreefolk.java | 3 ++- Mage.Sets/src/mage/cards/a/ArgothianWurm.java | 3 ++- .../src/mage/cards/a/ArjunTheShiftingFlame.java | 5 +++-- .../src/mage/cards/a/ArlinnEmbracedByTheMoon.java | 5 +++-- Mage.Sets/src/mage/cards/a/ArlinnKord.java | 3 ++- Mage.Sets/src/mage/cards/a/ArmadaWurm.java | 3 ++- Mage.Sets/src/mage/cards/a/ArmadilloCloak.java | 2 +- Mage.Sets/src/mage/cards/a/ArmamentCorps.java | 5 +++-- Mage.Sets/src/mage/cards/a/ArmamentMaster.java | 4 ++-- Mage.Sets/src/mage/cards/a/ArmamentOfNyx.java | 2 +- Mage.Sets/src/mage/cards/a/ArmedProtocolDroid.java | 5 +++-- Mage.Sets/src/mage/cards/a/ArmorOfFaith.java | 7 ++----- Mage.Sets/src/mage/cards/a/ArmorOfThorns.java | 7 ++----- Mage.Sets/src/mage/cards/a/ArmorSliver.java | 3 ++- Mage.Sets/src/mage/cards/a/ArmorThrull.java | 3 ++- Mage.Sets/src/mage/cards/a/ArmorcraftJudge.java | 5 +++-- Mage.Sets/src/mage/cards/a/ArmoredAscension.java | 2 +- Mage.Sets/src/mage/cards/a/ArmoredCancrix.java | 3 ++- Mage.Sets/src/mage/cards/a/ArmoredGalleon.java | 4 ++-- Mage.Sets/src/mage/cards/a/ArmoredGriffin.java | 3 ++- Mage.Sets/src/mage/cards/a/ArmoredGuardian.java | 5 +++-- Mage.Sets/src/mage/cards/a/ArmoredPegasus.java | 3 ++- Mage.Sets/src/mage/cards/a/ArmoredSkaab.java | 5 +++-- Mage.Sets/src/mage/cards/a/ArmoredTransport.java | 3 ++- Mage.Sets/src/mage/cards/a/ArmoredWarhorse.java | 3 ++- Mage.Sets/src/mage/cards/a/ArmoredWolfRider.java | 5 +++-- Mage.Sets/src/mage/cards/a/ArmorerGuildmage.java | 5 +++-- Mage.Sets/src/mage/cards/a/ArmoryAutomaton.java | 2 +- Mage.Sets/src/mage/cards/a/ArmoryGuard.java | 4 ++-- Mage.Sets/src/mage/cards/a/ArmoryOfIroas.java | 3 ++- Mage.Sets/src/mage/cards/a/ArmsDealer.java | 4 ++-- Mage.Sets/src/mage/cards/a/ArmyAnts.java | 3 ++- Mage.Sets/src/mage/cards/a/Arrest.java | 3 ++- Mage.Sets/src/mage/cards/a/ArrogantBloodlord.java | 5 +++-- Mage.Sets/src/mage/cards/a/ArrogantVampire.java | 3 ++- Mage.Sets/src/mage/cards/a/ArrogantWurm.java | 3 ++- Mage.Sets/src/mage/cards/a/ArrowVolleyTrap.java | 3 ++- Mage.Sets/src/mage/cards/a/ArsenalThresher.java | 8 +++++--- Mage.Sets/src/mage/cards/a/ArtifactPossession.java | 3 ++- Mage.Sets/src/mage/cards/a/ArtifactWard.java | 7 ++----- Mage.Sets/src/mage/cards/a/ArtificersHex.java | 2 +- Mage.Sets/src/mage/cards/a/ArtisanOfForms.java | 8 +++++--- Mage.Sets/src/mage/cards/a/ArtisanOfKozilek.java | 3 ++- Mage.Sets/src/mage/cards/a/AsajjVentress.java | 5 +++-- Mage.Sets/src/mage/cards/a/AscendantEvincar.java | 7 ++----- Mage.Sets/src/mage/cards/a/AscendedLawmage.java | 5 +++-- Mage.Sets/src/mage/cards/a/AscendingAven.java | 5 +++-- Mage.Sets/src/mage/cards/a/AshZealot.java | 5 +++-- Mage.Sets/src/mage/cards/a/AshasFavor.java | 7 ++----- Mage.Sets/src/mage/cards/a/AshcloudPhoenix.java | 7 ++----- Mage.Sets/src/mage/cards/a/AshcoatBear.java | 3 ++- Mage.Sets/src/mage/cards/a/AshenFirebeast.java | 5 +++-- Mage.Sets/src/mage/cards/a/AshenMonstrosity.java | 3 ++- Mage.Sets/src/mage/cards/a/AshenRider.java | 3 ++- Mage.Sets/src/mage/cards/a/AshenSkinZubera.java | 5 +++-- Mage.Sets/src/mage/cards/a/AshenmoorCohort.java | 9 +++------ Mage.Sets/src/mage/cards/a/AshenmoorGouger.java | 5 +++-- Mage.Sets/src/mage/cards/a/AshenmoorLiege.java | 5 +++-- .../src/mage/cards/a/AshiokNightmareWeaver.java | 2 +- Mage.Sets/src/mage/cards/a/AshioksAdept.java | 5 +++-- .../src/mage/cards/a/AshlingTheExtinguisher.java | 5 +++-- Mage.Sets/src/mage/cards/a/AshlingThePilgrim.java | 9 +++------ Mage.Sets/src/mage/cards/a/AshmouthBlade.java | 7 ++----- Mage.Sets/src/mage/cards/a/AshmouthHound.java | 5 +++-- Mage.Sets/src/mage/cards/a/AsmiraHolyAvenger.java | 4 ++-- Mage.Sets/src/mage/cards/a/AspectOfGorgon.java | 2 +- Mage.Sets/src/mage/cards/a/AspectOfMongoose.java | 7 ++----- Mage.Sets/src/mage/cards/a/AspectOfWolf.java | 2 +- Mage.Sets/src/mage/cards/a/AsphodelWanderer.java | 5 +++-- Mage.Sets/src/mage/cards/a/AspiringAeronaut.java | 5 +++-- Mage.Sets/src/mage/cards/a/AssaultGriffin.java | 3 ++- Mage.Sets/src/mage/cards/a/AssaultSuit.java | 2 +- Mage.Sets/src/mage/cards/a/AssaultZeppelid.java | 3 ++- Mage.Sets/src/mage/cards/a/AssembledAlphas.java | 3 ++- Mage.Sets/src/mage/cards/a/AssemblyWorker.java | 2 +- Mage.Sets/src/mage/cards/a/AsylumVisitor.java | 7 ++++--- Mage.Sets/src/mage/cards/a/AtalyaSamiteMaster.java | 9 +++------ Mage.Sets/src/mage/cards/a/AtarkaBeastbreaker.java | 9 +++------ Mage.Sets/src/mage/cards/a/AtarkaEfreet.java | 5 +++-- Mage.Sets/src/mage/cards/a/AtarkaMonument.java | 3 ++- Mage.Sets/src/mage/cards/a/AtarkaPummeler.java | 4 ++-- Mage.Sets/src/mage/cards/a/AtarkaWorldRender.java | 2 +- .../src/mage/cards/a/AthreosGodOfPassage.java | 2 +- Mage.Sets/src/mage/cards/a/Atog.java | 3 ++- Mage.Sets/src/mage/cards/a/Atogatog.java | 2 +- .../src/mage/cards/a/AtraxaPraetorsVoice.java | 5 +++-- Mage.Sets/src/mage/cards/a/AttendedKnight.java | 5 +++-- .../src/mage/cards/a/AudaciousInfiltrator.java | 5 +++-- .../src/mage/cards/a/AugmentingAutomaton.java | 3 ++- Mage.Sets/src/mage/cards/a/AugurIlVec.java | 5 +++-- Mage.Sets/src/mage/cards/a/AugurOfBolas.java | 5 +++-- Mage.Sets/src/mage/cards/a/AugurOfSkulls.java | 5 +++-- Mage.Sets/src/mage/cards/a/AuguryAdept.java | 5 +++-- Mage.Sets/src/mage/cards/a/AuguryOwl.java | 3 ++- Mage.Sets/src/mage/cards/a/AuntiesSnitch.java | 4 ++-- Mage.Sets/src/mage/cards/a/AuraBarbs.java | 2 +- Mage.Sets/src/mage/cards/a/AuraGnarlid.java | 2 +- Mage.Sets/src/mage/cards/a/AuraOfDominion.java | 3 ++- Mage.Sets/src/mage/cards/a/AuraThief.java | 3 ++- Mage.Sets/src/mage/cards/a/Auramancer.java | 5 +++-- Mage.Sets/src/mage/cards/a/AuramancersGuise.java | 2 +- Mage.Sets/src/mage/cards/a/Auratog.java | 3 ++- Mage.Sets/src/mage/cards/a/AuratouchedMage.java | 4 ++-- .../src/mage/cards/a/AureliaTheWarleader.java | 3 ++- Mage.Sets/src/mage/cards/a/AuriokBladewarden.java | 5 +++-- Mage.Sets/src/mage/cards/a/AuriokChampion.java | 5 +++-- Mage.Sets/src/mage/cards/a/AuriokEdgewright.java | 5 +++-- Mage.Sets/src/mage/cards/a/AuriokGlaivemaster.java | 5 +++-- Mage.Sets/src/mage/cards/a/AuriokReplica.java | 3 ++- Mage.Sets/src/mage/cards/a/AuriokSalvagers.java | 7 ++++--- Mage.Sets/src/mage/cards/a/AuriokSiegeSled.java | 3 ++- Mage.Sets/src/mage/cards/a/AuriokSteelshaper.java | 4 ++-- Mage.Sets/src/mage/cards/a/AuriokSunchaser.java | 5 +++-- Mage.Sets/src/mage/cards/a/AuriokSurvivors.java | 4 ++-- Mage.Sets/src/mage/cards/a/AuriokTransfixer.java | 5 +++-- Mage.Sets/src/mage/cards/a/AuriokWindwalker.java | 4 ++-- Mage.Sets/src/mage/cards/a/Aurochs.java | 2 +- Mage.Sets/src/mage/cards/a/AurochsHerd.java | 2 +- Mage.Sets/src/mage/cards/a/AuroraEidolon.java | 3 ++- Mage.Sets/src/mage/cards/a/AuroraGriffin.java | 3 ++- Mage.Sets/src/mage/cards/a/AuroraOfEmrakul.java | 5 +++-- .../src/mage/cards/a/AurraSingBaneOfJedi.java | 3 ++- Mage.Sets/src/mage/cards/a/AuspiciousAncestor.java | 5 +++-- Mage.Sets/src/mage/cards/a/AutochthonWurm.java | 3 ++- Mage.Sets/src/mage/cards/a/AvacynAngelOfHope.java | 7 ++----- .../src/mage/cards/a/AvacynGuardianAngel.java | 2 +- Mage.Sets/src/mage/cards/a/AvacynThePurifier.java | 7 ++----- .../src/mage/cards/a/AvacynianMissionaries.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvacynianPriest.java | 4 ++-- Mage.Sets/src/mage/cards/a/AvacynsCollar.java | 7 ++----- Mage.Sets/src/mage/cards/a/AvacynsPilgrim.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvalancheRiders.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvalancheTusker.java | 5 +++-- Mage.Sets/src/mage/cards/a/Avarax.java | 3 ++- Mage.Sets/src/mage/cards/a/AvariceAmulet.java | 2 +- Mage.Sets/src/mage/cards/a/AvariciousDragon.java | 3 ++- Mage.Sets/src/mage/cards/a/AvatarOfDiscord.java | 3 ++- Mage.Sets/src/mage/cards/a/AvatarOfFury.java | 3 ++- Mage.Sets/src/mage/cards/a/AvatarOfHope.java | 2 +- Mage.Sets/src/mage/cards/a/AvatarOfMight.java | 2 +- Mage.Sets/src/mage/cards/a/AvatarOfSlaughter.java | 9 ++++++--- .../src/mage/cards/a/AvatarOfTheResolute.java | 3 ++- Mage.Sets/src/mage/cards/a/AvatarOfWill.java | 2 +- Mage.Sets/src/mage/cards/a/AvatarOfWoe.java | 2 +- Mage.Sets/src/mage/cards/a/AvenArcher.java | 7 ++++--- Mage.Sets/src/mage/cards/a/AvenAugur.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvenBattlePriest.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvenBrigadier.java | 4 ++-- Mage.Sets/src/mage/cards/a/AvenCloudchaser.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvenEnvoy.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvenFarseer.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvenFateshaper.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvenFisher.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvenFleetwing.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvenFlock.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvenFogbringer.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvenInitiate.java | 10 ++++++---- Mage.Sets/src/mage/cards/a/AvenLiberator.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvenMimeomancer.java | 4 ++-- Mage.Sets/src/mage/cards/a/AvenMindcensor.java | 9 +++------ Mage.Sets/src/mage/cards/a/AvenOfEnduringHope.java | 8 +++++--- Mage.Sets/src/mage/cards/a/AvenRedeemer.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvenReedstalker.java | 8 +++++--- Mage.Sets/src/mage/cards/a/AvenRiftwatcher.java | 7 ++++--- Mage.Sets/src/mage/cards/a/AvenSkirmisher.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvenSmokeweaver.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvenSoulgazer.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvenSquire.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvenSunstriker.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvenSurveyor.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvenTactician.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvenTrailblazer.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvenTrooper.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvenWarhawk.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvenWindGuide.java | 14 ++++++++------ Mage.Sets/src/mage/cards/a/AvenWindreader.java | 7 ++++--- Mage.Sets/src/mage/cards/a/AvengerEnDal.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvengerOfZendikar.java | 2 +- Mage.Sets/src/mage/cards/a/AvengingAngel.java | 3 ++- Mage.Sets/src/mage/cards/a/AvengingDruid.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvianChangeling.java | 3 ++- Mage.Sets/src/mage/cards/a/AviaryMechanic.java | 5 +++-- Mage.Sets/src/mage/cards/a/AvidReclaimer.java | 7 ++++--- Mage.Sets/src/mage/cards/a/Avizoa.java | 3 ++- Mage.Sets/src/mage/cards/a/AwakenTheAncient.java | 4 ++-- Mage.Sets/src/mage/cards/a/AwakenerDruid.java | 6 +++--- Mage.Sets/src/mage/cards/a/AwokenHorror.java | 4 ++-- Mage.Sets/src/mage/cards/a/AxebaneGuardian.java | 5 +++-- Mage.Sets/src/mage/cards/a/AxebaneStag.java | 3 ++- Mage.Sets/src/mage/cards/a/AxegrinderGiant.java | 5 +++-- Mage.Sets/src/mage/cards/a/AyliEternalPilgrim.java | 8 +++++--- Mage.Sets/src/mage/cards/a/AysenBureaucrats.java | 5 +++-- .../src/mage/cards/a/AyumiTheLastVisitor.java | 3 ++- Mage.Sets/src/mage/cards/a/AzamiLadyOfScrolls.java | 4 ++-- Mage.Sets/src/mage/cards/a/AzimaetDrake.java | 3 ++- Mage.Sets/src/mage/cards/a/AzoriusAEthermage.java | 5 +++-- Mage.Sets/src/mage/cards/a/AzoriusArrester.java | 5 +++-- Mage.Sets/src/mage/cards/a/AzoriusFirstWing.java | 3 ++- Mage.Sets/src/mage/cards/a/AzoriusGuildgate.java | 3 ++- Mage.Sets/src/mage/cards/a/AzoriusGuildmage.java | 5 +++-- Mage.Sets/src/mage/cards/a/AzoriusHerald.java | 3 ++- Mage.Sets/src/mage/cards/a/AzoriusJusticiar.java | 5 +++-- Mage.Sets/src/mage/cards/a/AzoriusKeyrune.java | 3 ++- Mage.Sets/src/mage/cards/a/AzorsElocutors.java | 9 +++------ Mage.Sets/src/mage/cards/a/AzureDrake.java | 3 ++- Mage.Sets/src/mage/cards/a/AzureMage.java | 5 +++-- .../src/mage/cards/a/AzusaLostButSeeking.java | 9 +++------ Mage.Sets/src/mage/cards/c/CallToServe.java | 2 +- Mage.Sets/src/mage/cards/g/Ghoulflesh.java | 2 +- Mage.Sets/src/mage/cards/t/TrooperArmor.java | 5 +++-- .../continuous/AddCardSubtypeAttachedEffect.java | 4 ++-- 628 files changed, 1541 insertions(+), 1256 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AAT1.java b/Mage.Sets/src/mage/cards/a/AAT1.java index f28ed341dd5..789fe55b8e5 100644 --- a/Mage.Sets/src/mage/cards/a/AAT1.java +++ b/Mage.Sets/src/mage/cards/a/AAT1.java @@ -40,6 +40,7 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -55,8 +56,8 @@ public class AAT1 extends CardImpl { public AAT1(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{1}{W}{U}{B}"); - this.subtype.add("Droid"); - this.subtype.add("Construct"); + this.subtype.add(SubType.DROID); + this.subtype.add(SubType.CONSTRUCT); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/ATST.java b/Mage.Sets/src/mage/cards/a/ATST.java index 160ab562cd8..4e86b20689c 100644 --- a/Mage.Sets/src/mage/cards/a/ATST.java +++ b/Mage.Sets/src/mage/cards/a/ATST.java @@ -55,8 +55,8 @@ public class ATST extends CardImpl { public ATST(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{5}{G}"); - this.subtype.add("Trooper"); - this.subtype.add("Construct"); + this.subtype.add(SubType.TROOPER); + this.subtype.add(SubType.CONSTRUCT); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AWing.java b/Mage.Sets/src/mage/cards/a/AWing.java index e88009c1ad2..b995d8cf7d9 100644 --- a/Mage.Sets/src/mage/cards/a/AWing.java +++ b/Mage.Sets/src/mage/cards/a/AWing.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; @@ -53,8 +54,8 @@ public class AWing extends CardImpl { public AWing(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{2}{R}"); - this.subtype.add("Rebel"); - this.subtype.add("Starship"); + this.subtype.add(SubType.REBEL); + this.subtype.add(SubType.STARSHIP); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AbattoirGhoul.java b/Mage.Sets/src/mage/cards/a/AbattoirGhoul.java index ca00c4836eb..32c27e4a4fe 100644 --- a/Mage.Sets/src/mage/cards/a/AbattoirGhoul.java +++ b/Mage.Sets/src/mage/cards/a/AbattoirGhoul.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; @@ -52,7 +53,7 @@ public class AbattoirGhoul extends CardImpl { public AbattoirGhoul(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}"); - this.subtype.add("Zombie"); + this.subtype.add(SubType.ZOMBIE); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AbbeyGargoyles.java b/Mage.Sets/src/mage/cards/a/AbbeyGargoyles.java index 1d41b84ddf8..3ba537c6468 100644 --- a/Mage.Sets/src/mage/cards/a/AbbeyGargoyles.java +++ b/Mage.Sets/src/mage/cards/a/AbbeyGargoyles.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,7 +46,7 @@ public class AbbeyGargoyles extends CardImpl { public AbbeyGargoyles(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}{W}"); - this.subtype.add("Gargoyle"); + this.subtype.add(SubType.GARGOYLE); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AbbeyGriffin.java b/Mage.Sets/src/mage/cards/a/AbbeyGriffin.java index 1bf179083a8..5a3a23998f3 100644 --- a/Mage.Sets/src/mage/cards/a/AbbeyGriffin.java +++ b/Mage.Sets/src/mage/cards/a/AbbeyGriffin.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,7 +46,7 @@ public class AbbeyGriffin extends CardImpl { public AbbeyGriffin(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add("Griffin"); + this.subtype.add(SubType.GRIFFIN); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AbbeyMatron.java b/Mage.Sets/src/mage/cards/a/AbbeyMatron.java index 8a009d0baee..5dd6d71af2b 100644 --- a/Mage.Sets/src/mage/cards/a/AbbeyMatron.java +++ b/Mage.Sets/src/mage/cards/a/AbbeyMatron.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -49,8 +50,8 @@ public class AbbeyMatron extends CardImpl { public AbbeyMatron(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.subtype.add("Human"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AbbotOfKeralKeep.java b/Mage.Sets/src/mage/cards/a/AbbotOfKeralKeep.java index 2eccf3acc64..1ca41c12357 100644 --- a/Mage.Sets/src/mage/cards/a/AbbotOfKeralKeep.java +++ b/Mage.Sets/src/mage/cards/a/AbbotOfKeralKeep.java @@ -37,10 +37,7 @@ import mage.abilities.keyword.ProwessAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Library; @@ -57,8 +54,8 @@ public class AbbotOfKeralKeep extends CardImpl { public AbbotOfKeralKeep(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}"); - this.subtype.add("Human"); - this.subtype.add("Monk"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.MONK); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/Abduction.java b/Mage.Sets/src/mage/cards/a/Abduction.java index 1c7384c176c..3ecd7958e31 100644 --- a/Mage.Sets/src/mage/cards/a/Abduction.java +++ b/Mage.Sets/src/mage/cards/a/Abduction.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -53,7 +54,7 @@ public class Abduction extends CardImpl { public Abduction(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{U}{U}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature diff --git a/Mage.Sets/src/mage/cards/a/AberrantResearcher.java b/Mage.Sets/src/mage/cards/a/AberrantResearcher.java index 40b134eec56..27f2c24099a 100644 --- a/Mage.Sets/src/mage/cards/a/AberrantResearcher.java +++ b/Mage.Sets/src/mage/cards/a/AberrantResearcher.java @@ -38,10 +38,7 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.p.PerfectedForm; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; @@ -55,8 +52,8 @@ public class AberrantResearcher extends CardImpl { public AberrantResearcher(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}"); - this.subtype.add("Human"); - this.subtype.add("Insect"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.INSECT); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AbhorrentOverlord.java b/Mage.Sets/src/mage/cards/a/AbhorrentOverlord.java index c65135e0124..6727b0a605f 100644 --- a/Mage.Sets/src/mage/cards/a/AbhorrentOverlord.java +++ b/Mage.Sets/src/mage/cards/a/AbhorrentOverlord.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ColoredManaSymbol; +import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.game.permanent.token.Token; @@ -53,7 +54,7 @@ public class AbhorrentOverlord extends CardImpl { public AbhorrentOverlord(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{B}{B}"); - this.subtype.add("Demon"); + this.subtype.add(SubType.DEMON); this.power = new MageInt(6); this.toughness = new MageInt(6); @@ -84,7 +85,7 @@ class AbhorrentOverlordHarpyToken extends Token { super("Harpy", "1/1 black Harpy creature tokens with flying"); cardType.add(CardType.CREATURE); color.setBlack(true); - subtype.add("Harpy"); + subtype.add(SubType.HARPY); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AbolisherOfBloodlines.java b/Mage.Sets/src/mage/cards/a/AbolisherOfBloodlines.java index 10b7d66c082..c8dfee1ca70 100644 --- a/Mage.Sets/src/mage/cards/a/AbolisherOfBloodlines.java +++ b/Mage.Sets/src/mage/cards/a/AbolisherOfBloodlines.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -53,8 +54,8 @@ public class AbolisherOfBloodlines extends CardImpl { public AbolisherOfBloodlines(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},""); - this.subtype.add("Eldrazi"); - this.subtype.add("Vampire"); + this.subtype.add(SubType.ELDRAZI); + this.subtype.add(SubType.VAMPIRE); this.power = new MageInt(6); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/Abomination.java b/Mage.Sets/src/mage/cards/a/Abomination.java index ea1b9c9ec42..b4ae81b169d 100644 --- a/Mage.Sets/src/mage/cards/a/Abomination.java +++ b/Mage.Sets/src/mage/cards/a/Abomination.java @@ -37,6 +37,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; @@ -57,7 +58,7 @@ public class Abomination extends CardImpl { public Abomination(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}{B}"); - this.subtype.add("Horror"); + this.subtype.add(SubType.HORROR); this.power = new MageInt(2); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/AbominationOfGudul.java b/Mage.Sets/src/mage/cards/a/AbominationOfGudul.java index 8fa4089c9b3..18506fc31a1 100644 --- a/Mage.Sets/src/mage/cards/a/AbominationOfGudul.java +++ b/Mage.Sets/src/mage/cards/a/AbominationOfGudul.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.MorphAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -48,7 +49,7 @@ public class AbominationOfGudul extends CardImpl { public AbominationOfGudul(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{G}{U}"); - this.subtype.add("Horror"); + this.subtype.add(SubType.HORROR); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/Aboroth.java b/Mage.Sets/src/mage/cards/a/Aboroth.java index faf43473de4..38032c86e12 100644 --- a/Mage.Sets/src/mage/cards/a/Aboroth.java +++ b/Mage.Sets/src/mage/cards/a/Aboroth.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.CumulativeUpkeepAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -50,7 +51,7 @@ public class Aboroth extends CardImpl { public Aboroth(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{G}{G}"); - this.subtype.add("Elemental"); + this.subtype.add(SubType.ELEMENTAL); this.power = new MageInt(9); this.toughness = new MageInt(9); diff --git a/Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java b/Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java index 1d92ba4fad3..9b34908a9b4 100644 --- a/Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java +++ b/Mage.Sets/src/mage/cards/a/AboshanCephalidEmperor.java @@ -68,7 +68,7 @@ static { public AboshanCephalidEmperor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}{U}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Cephalid"); + this.subtype.add(SubType.CEPHALID); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AboshansDesire.java b/Mage.Sets/src/mage/cards/a/AboshansDesire.java index bf4e6b6eacd..aaab61c3f0c 100644 --- a/Mage.Sets/src/mage/cards/a/AboshansDesire.java +++ b/Mage.Sets/src/mage/cards/a/AboshansDesire.java @@ -52,7 +52,7 @@ public class AboshansDesire extends CardImpl { public AboshansDesire(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{U}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature diff --git a/Mage.Sets/src/mage/cards/a/AbsolverThrull.java b/Mage.Sets/src/mage/cards/a/AbsolverThrull.java index a7eaea850a3..4bc59377e96 100644 --- a/Mage.Sets/src/mage/cards/a/AbsolverThrull.java +++ b/Mage.Sets/src/mage/cards/a/AbsolverThrull.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.HauntAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.target.common.TargetEnchantmentPermanent; import java.util.UUID; @@ -46,8 +47,8 @@ public class AbsolverThrull extends CardImpl { public AbsolverThrull(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add("Thrull"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.THRULL); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AbuJafar.java b/Mage.Sets/src/mage/cards/a/AbuJafar.java index 18d94d0c18d..05c5e53b6b3 100644 --- a/Mage.Sets/src/mage/cards/a/AbuJafar.java +++ b/Mage.Sets/src/mage/cards/a/AbuJafar.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.DestroyAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.BlockedByIdPredicate; @@ -48,7 +49,7 @@ public class AbuJafar extends CardImpl { public AbuJafar(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}"); - this.subtype.add("Human"); + this.subtype.add(SubType.HUMAN); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AbunaAcolyte.java b/Mage.Sets/src/mage/cards/a/AbunaAcolyte.java index 38c665fb309..59aecc4c1e0 100644 --- a/Mage.Sets/src/mage/cards/a/AbunaAcolyte.java +++ b/Mage.Sets/src/mage/cards/a/AbunaAcolyte.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -58,8 +59,8 @@ public class AbunaAcolyte extends CardImpl { public AbunaAcolyte(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Cat"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.CAT); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AbundantGrowth.java b/Mage.Sets/src/mage/cards/a/AbundantGrowth.java index 7405e6976af..a98e8b95111 100644 --- a/Mage.Sets/src/mage/cards/a/AbundantGrowth.java +++ b/Mage.Sets/src/mage/cards/a/AbundantGrowth.java @@ -39,10 +39,7 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -55,7 +52,7 @@ public class AbundantGrowth extends CardImpl { public AbundantGrowth(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{G}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/cards/a/AbundantMaw.java b/Mage.Sets/src/mage/cards/a/AbundantMaw.java index c7474aeb8ec..17f888d1b5c 100644 --- a/Mage.Sets/src/mage/cards/a/AbundantMaw.java +++ b/Mage.Sets/src/mage/cards/a/AbundantMaw.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.EmergeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.target.common.TargetOpponent; import java.util.UUID; @@ -49,8 +50,8 @@ public class AbundantMaw extends CardImpl { public AbundantMaw(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{8}"); - this.subtype.add("Eldrazi"); - this.subtype.add("Leech"); + this.subtype.add(SubType.ELDRAZI); + this.subtype.add(SubType.LEECH); this.power = new MageInt(6); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AbyssalGatekeeper.java b/Mage.Sets/src/mage/cards/a/AbyssalGatekeeper.java index 31a2981773d..45b8a5fb9a5 100644 --- a/Mage.Sets/src/mage/cards/a/AbyssalGatekeeper.java +++ b/Mage.Sets/src/mage/cards/a/AbyssalGatekeeper.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.SacrificeAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; import java.util.UUID; @@ -45,7 +46,7 @@ public class AbyssalGatekeeper extends CardImpl { public AbyssalGatekeeper(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}"); - this.subtype.add("Horror"); + this.subtype.add(SubType.HORROR); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AbyssalHorror.java b/Mage.Sets/src/mage/cards/a/AbyssalHorror.java index 2ee06bbfa6a..a09b40d0ac8 100644 --- a/Mage.Sets/src/mage/cards/a/AbyssalHorror.java +++ b/Mage.Sets/src/mage/cards/a/AbyssalHorror.java @@ -36,6 +36,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.target.TargetPlayer; import java.util.UUID; @@ -48,7 +49,7 @@ public class AbyssalHorror extends CardImpl { public AbyssalHorror (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{B}"); - this.subtype.add("Horror"); + this.subtype.add(SubType.HORROR); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AbyssalHunter.java b/Mage.Sets/src/mage/cards/a/AbyssalHunter.java index 81a402cd113..b128b90d46b 100644 --- a/Mage.Sets/src/mage/cards/a/AbyssalHunter.java +++ b/Mage.Sets/src/mage/cards/a/AbyssalHunter.java @@ -39,6 +39,7 @@ import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; @@ -52,8 +53,8 @@ public class AbyssalHunter extends CardImpl { public AbyssalHunter(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}"); - this.subtype.add("Human"); - this.subtype.add("Assassin"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.ASSASSIN); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AbyssalNightstalker.java b/Mage.Sets/src/mage/cards/a/AbyssalNightstalker.java index 682950dd2c8..e642cbfbdfc 100644 --- a/Mage.Sets/src/mage/cards/a/AbyssalNightstalker.java +++ b/Mage.Sets/src/mage/cards/a/AbyssalNightstalker.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,7 +46,7 @@ public class AbyssalNightstalker extends CardImpl { public AbyssalNightstalker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}"); - this.subtype.add("Nightstalker"); + this.subtype.add(SubType.NIGHTSTALKER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AbyssalNocturnus.java b/Mage.Sets/src/mage/cards/a/AbyssalNocturnus.java index 5b1b2aec524..a10437d585e 100644 --- a/Mage.Sets/src/mage/cards/a/AbyssalNocturnus.java +++ b/Mage.Sets/src/mage/cards/a/AbyssalNocturnus.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import java.util.UUID; @@ -49,7 +50,7 @@ public class AbyssalNocturnus extends CardImpl { public AbyssalNocturnus(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{B}"); - this.subtype.add("Horror"); + this.subtype.add(SubType.HORROR); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AbyssalPersecutor.java b/Mage.Sets/src/mage/cards/a/AbyssalPersecutor.java index ce7ae8bbf1c..d895fbb82f0 100644 --- a/Mage.Sets/src/mage/cards/a/AbyssalPersecutor.java +++ b/Mage.Sets/src/mage/cards/a/AbyssalPersecutor.java @@ -35,10 +35,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -53,7 +50,7 @@ public class AbyssalPersecutor extends CardImpl { public AbyssalPersecutor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}"); - this.subtype.add("Demon"); + this.subtype.add(SubType.DEMON); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/AbyssalSpecter.java b/Mage.Sets/src/mage/cards/a/AbyssalSpecter.java index f9b5de2d920..844c028ebbb 100644 --- a/Mage.Sets/src/mage/cards/a/AbyssalSpecter.java +++ b/Mage.Sets/src/mage/cards/a/AbyssalSpecter.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,7 +46,7 @@ public class AbyssalSpecter extends CardImpl { public AbyssalSpecter(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}"); - this.subtype.add("Specter"); + this.subtype.add(SubType.SPECTER); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java b/Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java index 6464a6e21c8..dd46fbc98b4 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java +++ b/Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java @@ -35,10 +35,7 @@ import mage.abilities.keyword.LifelinkAbility; import mage.abilities.keyword.OutlastAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -64,8 +61,8 @@ public class AbzanBattlePriest extends CardImpl { public AbzanBattlePriest(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add("Human"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AbzanBeastmaster.java b/Mage.Sets/src/mage/cards/a/AbzanBeastmaster.java index f1b14cc54f1..59c594a9fea 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanBeastmaster.java +++ b/Mage.Sets/src/mage/cards/a/AbzanBeastmaster.java @@ -35,6 +35,7 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.TargetController; import java.util.UUID; @@ -47,8 +48,8 @@ public class AbzanBeastmaster extends CardImpl { public AbzanBeastmaster(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); - this.subtype.add("Hound"); - this.subtype.add("Shaman"); + this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.SHAMAN); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AbzanFalconer.java b/Mage.Sets/src/mage/cards/a/AbzanFalconer.java index 088a1dc15b8..fd421749f4c 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanFalconer.java +++ b/Mage.Sets/src/mage/cards/a/AbzanFalconer.java @@ -59,8 +59,8 @@ public class AbzanFalconer extends CardImpl { public AbzanFalconer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AbzanGuide.java b/Mage.Sets/src/mage/cards/a/AbzanGuide.java index c5a33e585af..866b3dab55e 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanGuide.java +++ b/Mage.Sets/src/mage/cards/a/AbzanGuide.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.MorphAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,8 +46,8 @@ public class AbzanGuide extends CardImpl { public AbzanGuide(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{B}{G}"); - this.subtype.add("Human"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AbzanKinGuard.java b/Mage.Sets/src/mage/cards/a/AbzanKinGuard.java index ffbef435a90..f7d66d427b8 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanKinGuard.java +++ b/Mage.Sets/src/mage/cards/a/AbzanKinGuard.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; @@ -59,8 +60,8 @@ public class AbzanKinGuard extends CardImpl { public AbzanKinGuard(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); - this.subtype.add("Human"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AbzanRunemark.java b/Mage.Sets/src/mage/cards/a/AbzanRunemark.java index fbc8336e0cf..028f07c6a49 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanRunemark.java +++ b/Mage.Sets/src/mage/cards/a/AbzanRunemark.java @@ -62,7 +62,7 @@ public class AbzanRunemark extends CardImpl { public AbzanRunemark(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/cards/a/AbzanSkycaptain.java b/Mage.Sets/src/mage/cards/a/AbzanSkycaptain.java index 850cabcec2b..7bae5fd892c 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanSkycaptain.java +++ b/Mage.Sets/src/mage/cards/a/AbzanSkycaptain.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,8 +46,8 @@ public class AbzanSkycaptain extends CardImpl { public AbzanSkycaptain(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add("Bird"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AcademyElite.java b/Mage.Sets/src/mage/cards/a/AcademyElite.java index 4e7551c48d2..8d8c3403726 100644 --- a/Mage.Sets/src/mage/cards/a/AcademyElite.java +++ b/Mage.Sets/src/mage/cards/a/AcademyElite.java @@ -39,6 +39,7 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterInstantOrSorceryCard; @@ -53,8 +54,8 @@ public class AcademyElite extends CardImpl { public AcademyElite(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/a/AcademyRaider.java b/Mage.Sets/src/mage/cards/a/AcademyRaider.java index 3f2eb5ab1c4..da9c754fc89 100644 --- a/Mage.Sets/src/mage/cards/a/AcademyRaider.java +++ b/Mage.Sets/src/mage/cards/a/AcademyRaider.java @@ -36,6 +36,7 @@ import mage.abilities.keyword.IntimidateAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -47,8 +48,8 @@ public class AcademyRaider extends CardImpl { public AcademyRaider(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); - this.subtype.add("Human"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AcademyRector.java b/Mage.Sets/src/mage/cards/a/AcademyRector.java index 3fde8f27543..8a3da992604 100644 --- a/Mage.Sets/src/mage/cards/a/AcademyRector.java +++ b/Mage.Sets/src/mage/cards/a/AcademyRector.java @@ -35,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.SubType; import mage.filter.common.FilterEnchantmentCard; import mage.target.common.TargetCardInLibrary; @@ -48,8 +49,8 @@ public class AcademyRector extends CardImpl { public AcademyRector(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}"); - this.subtype.add("Human"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AcademyResearchers.java b/Mage.Sets/src/mage/cards/a/AcademyResearchers.java index bfb2059ae25..536694e6eea 100644 --- a/Mage.Sets/src/mage/cards/a/AcademyResearchers.java +++ b/Mage.Sets/src/mage/cards/a/AcademyResearchers.java @@ -56,8 +56,8 @@ public class AcademyResearchers extends CardImpl { public AcademyResearchers(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{U}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AccomplishedAutomaton.java b/Mage.Sets/src/mage/cards/a/AccomplishedAutomaton.java index 701c7e9c08d..eb06d440013 100644 --- a/Mage.Sets/src/mage/cards/a/AccomplishedAutomaton.java +++ b/Mage.Sets/src/mage/cards/a/AccomplishedAutomaton.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.FabricateAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,7 +44,7 @@ public class AccomplishedAutomaton extends CardImpl { public AccomplishedAutomaton(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{7}"); - this.subtype.add("Construct"); + this.subtype.add(SubType.CONSTRUCT); this.power = new MageInt(5); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/a/AccorderPaladin.java b/Mage.Sets/src/mage/cards/a/AccorderPaladin.java index 72554b2758c..cd8d8b6f1a8 100644 --- a/Mage.Sets/src/mage/cards/a/AccorderPaladin.java +++ b/Mage.Sets/src/mage/cards/a/AccorderPaladin.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.BattleCryAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,8 +45,8 @@ public class AccorderPaladin extends CardImpl { public AccorderPaladin (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Human"); - this.subtype.add("Knight"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.KNIGHT); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AccordersShield.java b/Mage.Sets/src/mage/cards/a/AccordersShield.java index d94e839a7b4..9ecf1bfd4df 100644 --- a/Mage.Sets/src/mage/cards/a/AccordersShield.java +++ b/Mage.Sets/src/mage/cards/a/AccordersShield.java @@ -36,10 +36,7 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import java.util.UUID; @@ -51,7 +48,7 @@ public class AccordersShield extends CardImpl { public AccordersShield (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{0}"); - this.subtype.add("Equipment"); + this.subtype.add(SubType.EQUIPMENT); this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.EQUIPMENT))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(0, 3))); diff --git a/Mage.Sets/src/mage/cards/a/AccursedCentaur.java b/Mage.Sets/src/mage/cards/a/AccursedCentaur.java index faacb1e1745..efda95d43d1 100644 --- a/Mage.Sets/src/mage/cards/a/AccursedCentaur.java +++ b/Mage.Sets/src/mage/cards/a/AccursedCentaur.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.SacrificeControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import java.util.UUID; @@ -45,8 +46,8 @@ public class AccursedCentaur extends CardImpl { public AccursedCentaur(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}"); - this.subtype.add("Zombie"); - this.subtype.add("Centaur"); + this.subtype.add(SubType.ZOMBIE); + this.subtype.add(SubType.CENTAUR); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AccursedHorde.java b/Mage.Sets/src/mage/cards/a/AccursedHorde.java index cf1d1db84d7..6d340259262 100644 --- a/Mage.Sets/src/mage/cards/a/AccursedHorde.java +++ b/Mage.Sets/src/mage/cards/a/AccursedHorde.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,8 @@ import mage.filter.common.FilterAttackingCreature; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetAttackingCreature; +import java.util.UUID; + /** * * @author fireshoes @@ -59,7 +60,7 @@ public class AccursedHorde extends CardImpl { public AccursedHorde(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}"); - this.subtype.add("Zombie"); + this.subtype.add(SubType.ZOMBIE); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AccursedSpirit.java b/Mage.Sets/src/mage/cards/a/AccursedSpirit.java index b3828b56207..7f6ed141541 100644 --- a/Mage.Sets/src/mage/cards/a/AccursedSpirit.java +++ b/Mage.Sets/src/mage/cards/a/AccursedSpirit.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.IntimidateAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,7 +44,7 @@ public class AccursedSpirit extends CardImpl { public AccursedSpirit(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}"); - this.subtype.add("Spirit"); + this.subtype.add(SubType.SPIRIT); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AccursedWitch.java b/Mage.Sets/src/mage/cards/a/AccursedWitch.java index cf910a5458e..8e9a4ca1c69 100644 --- a/Mage.Sets/src/mage/cards/a/AccursedWitch.java +++ b/Mage.Sets/src/mage/cards/a/AccursedWitch.java @@ -57,8 +57,8 @@ public class AccursedWitch extends CardImpl { public AccursedWitch(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}"); - this.subtype.add("Human"); - this.subtype.add("Shaman"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SHAMAN); this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java b/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java index 48046884763..9515e29bcf9 100644 --- a/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java +++ b/Mage.Sets/src/mage/cards/a/AcidSpewerDragon.java @@ -60,7 +60,7 @@ public class AcidSpewerDragon extends CardImpl { public AcidSpewerDragon(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{B}"); - this.subtype.add("Dragon"); + this.subtype.add(SubType.DRAGON); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AcidWebSpider.java b/Mage.Sets/src/mage/cards/a/AcidWebSpider.java index 012d4d558ba..99c7469b10f 100644 --- a/Mage.Sets/src/mage/cards/a/AcidWebSpider.java +++ b/Mage.Sets/src/mage/cards/a/AcidWebSpider.java @@ -56,7 +56,7 @@ public class AcidWebSpider extends CardImpl { public AcidWebSpider (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}"); - this.subtype.add("Spider"); + this.subtype.add(SubType.SPIDER); this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AcidicSlime.java b/Mage.Sets/src/mage/cards/a/AcidicSlime.java index 2cf813b62f7..8285aec78bc 100644 --- a/Mage.Sets/src/mage/cards/a/AcidicSlime.java +++ b/Mage.Sets/src/mage/cards/a/AcidicSlime.java @@ -36,6 +36,7 @@ import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -61,7 +62,7 @@ public class AcidicSlime extends CardImpl { public AcidicSlime(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}"); - this.subtype.add("Ooze"); + this.subtype.add(SubType.OOZE); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AcidicSliver.java b/Mage.Sets/src/mage/cards/a/AcidicSliver.java index 7a4f65a38fe..0b899efd837 100644 --- a/Mage.Sets/src/mage/cards/a/AcidicSliver.java +++ b/Mage.Sets/src/mage/cards/a/AcidicSliver.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.target.common.TargetCreatureOrPlayer; @@ -53,7 +54,7 @@ public class AcidicSliver extends CardImpl { public AcidicSliver(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{B}{R}"); - this.subtype.add("Sliver"); + this.subtype.add(SubType.SLIVER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AcklayOfTheArena.java b/Mage.Sets/src/mage/cards/a/AcklayOfTheArena.java index 5e8c98b1fef..8996d74f6a1 100644 --- a/Mage.Sets/src/mage/cards/a/AcklayOfTheArena.java +++ b/Mage.Sets/src/mage/cards/a/AcklayOfTheArena.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.MonstrosityAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.target.common.TargetOpponentsCreaturePermanent; import java.util.UUID; @@ -47,8 +48,8 @@ public class AcklayOfTheArena extends CardImpl { public AcklayOfTheArena(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{G}{W}"); - this.subtype.add("Insect"); - this.subtype.add("Beast"); + this.subtype.add(SubType.INSECT); + this.subtype.add(SubType.BEAST); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AcolyteOfTheInferno.java b/Mage.Sets/src/mage/cards/a/AcolyteOfTheInferno.java index 92cae0d8f95..69b5ab6dd7a 100644 --- a/Mage.Sets/src/mage/cards/a/AcolyteOfTheInferno.java +++ b/Mage.Sets/src/mage/cards/a/AcolyteOfTheInferno.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.RenownAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,8 +46,8 @@ public class AcolyteOfTheInferno extends CardImpl { public AcolyteOfTheInferno(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); - this.subtype.add("Human"); - this.subtype.add("Monk"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.MONK); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AcolyteOfXathrid.java b/Mage.Sets/src/mage/cards/a/AcolyteOfXathrid.java index d7b980b9d16..be271edba08 100644 --- a/Mage.Sets/src/mage/cards/a/AcolyteOfXathrid.java +++ b/Mage.Sets/src/mage/cards/a/AcolyteOfXathrid.java @@ -37,6 +37,7 @@ import mage.abilities.effects.common.LoseLifeTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.TargetPlayer; @@ -50,8 +51,8 @@ public class AcolyteOfXathrid extends CardImpl { public AcolyteOfXathrid(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}"); - this.subtype.add("Human"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/Acridian.java b/Mage.Sets/src/mage/cards/a/Acridian.java index 0b25241fd20..0eb321d1c9d 100644 --- a/Mage.Sets/src/mage/cards/a/Acridian.java +++ b/Mage.Sets/src/mage/cards/a/Acridian.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.EchoAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,7 +45,7 @@ public class Acridian extends CardImpl { public Acridian (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); - this.subtype.add("Insect"); + this.subtype.add(SubType.INSECT); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AdamaroFirstToDesire.java b/Mage.Sets/src/mage/cards/a/AdamaroFirstToDesire.java index 532e7c38bcd..7f43f601f26 100644 --- a/Mage.Sets/src/mage/cards/a/AdamaroFirstToDesire.java +++ b/Mage.Sets/src/mage/cards/a/AdamaroFirstToDesire.java @@ -35,10 +35,7 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; @@ -53,7 +50,7 @@ public class AdamaroFirstToDesire extends CardImpl { public AdamaroFirstToDesire(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{R}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Spirit"); + this.subtype.add(SubType.SPIRIT); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java b/Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java index f31cec391e2..42b13f2f59a 100644 --- a/Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java +++ b/Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java @@ -58,7 +58,7 @@ public class AdaptiveAutomaton extends CardImpl { public AdaptiveAutomaton(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{3}"); - this.subtype.add("Construct"); + this.subtype.add(SubType.CONSTRUCT); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AdaptiveSnapjaw.java b/Mage.Sets/src/mage/cards/a/AdaptiveSnapjaw.java index 3eaaa275611..a2faa3181d0 100644 --- a/Mage.Sets/src/mage/cards/a/AdaptiveSnapjaw.java +++ b/Mage.Sets/src/mage/cards/a/AdaptiveSnapjaw.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.EvolveAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,8 +44,8 @@ public class AdaptiveSnapjaw extends CardImpl { public AdaptiveSnapjaw(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}"); - this.subtype.add("Lizard"); - this.subtype.add("Beast"); + this.subtype.add(SubType.LIZARD); + this.subtype.add(SubType.BEAST); this.power = new MageInt(6); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AdarkarSentinel.java b/Mage.Sets/src/mage/cards/a/AdarkarSentinel.java index e32f2c94cd2..5f7fc053bb3 100644 --- a/Mage.Sets/src/mage/cards/a/AdarkarSentinel.java +++ b/Mage.Sets/src/mage/cards/a/AdarkarSentinel.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -48,7 +49,7 @@ public class AdarkarSentinel extends CardImpl { public AdarkarSentinel(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{5}"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AdarkarValkyrie.java b/Mage.Sets/src/mage/cards/a/AdarkarValkyrie.java index 93d0db0abbb..3649740b022 100644 --- a/Mage.Sets/src/mage/cards/a/AdarkarValkyrie.java +++ b/Mage.Sets/src/mage/cards/a/AdarkarValkyrie.java @@ -66,7 +66,7 @@ public class AdarkarValkyrie extends CardImpl { public AdarkarValkyrie(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}{W}"); addSuperType(SuperType.SNOW); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AdarkarWindform.java b/Mage.Sets/src/mage/cards/a/AdarkarWindform.java index 9e4f345d458..0da3e9c488b 100644 --- a/Mage.Sets/src/mage/cards/a/AdarkarWindform.java +++ b/Mage.Sets/src/mage/cards/a/AdarkarWindform.java @@ -35,10 +35,7 @@ import mage.abilities.effects.common.continuous.LoseAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -52,7 +49,7 @@ public class AdarkarWindform extends CardImpl { public AdarkarWindform(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}"); addSuperType(SuperType.SNOW); - this.subtype.add("Illusion"); + this.subtype.add(SubType.ILLUSION); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AdderStaffBoggart.java b/Mage.Sets/src/mage/cards/a/AdderStaffBoggart.java index b65937dfd92..ff38a81dbb3 100644 --- a/Mage.Sets/src/mage/cards/a/AdderStaffBoggart.java +++ b/Mage.Sets/src/mage/cards/a/AdderStaffBoggart.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.counters.CounterType; import java.util.UUID; @@ -46,8 +47,8 @@ public class AdderStaffBoggart extends CardImpl { public AdderStaffBoggart(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}"); - this.subtype.add("Goblin"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.GOBLIN); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AdmiralAckbar.java b/Mage.Sets/src/mage/cards/a/AdmiralAckbar.java index 08f02712be5..2bc69a1587d 100644 --- a/Mage.Sets/src/mage/cards/a/AdmiralAckbar.java +++ b/Mage.Sets/src/mage/cards/a/AdmiralAckbar.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.AttacksWithCreaturesTriggeredAbility; @@ -46,6 +45,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.token.RebelStarshipToken; +import java.util.UUID; + /** * * @author Styxo @@ -61,8 +62,8 @@ public class AdmiralAckbar extends CardImpl { public AdmiralAckbar(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{U}{U}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Calamari"); - this.subtype.add("Rebel"); + this.subtype.add(SubType.CALAMARI); + this.subtype.add(SubType.REBEL); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AdmonitionAngel.java b/Mage.Sets/src/mage/cards/a/AdmonitionAngel.java index c6405997cbd..8a147aae394 100644 --- a/Mage.Sets/src/mage/cards/a/AdmonitionAngel.java +++ b/Mage.Sets/src/mage/cards/a/AdmonitionAngel.java @@ -38,6 +38,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; @@ -62,7 +63,7 @@ public class AdmonitionAngel extends CardImpl { public AdmonitionAngel(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/AdornedPouncer.java b/Mage.Sets/src/mage/cards/a/AdornedPouncer.java index 21c58af83c0..0ce605324dd 100644 --- a/Mage.Sets/src/mage/cards/a/AdornedPouncer.java +++ b/Mage.Sets/src/mage/cards/a/AdornedPouncer.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.EternalizeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -42,7 +43,7 @@ public class AdornedPouncer extends CardImpl { public AdornedPouncer(UUID ownerId, CardSetInfo cardSetInfo) { super(ownerId, cardSetInfo, new CardType[]{CardType.CREATURE}, "{1}{W}"); - subtype.add("Cat"); + subtype.add(SubType.CAT); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AdrianaCaptainOfTheGuard.java b/Mage.Sets/src/mage/cards/a/AdrianaCaptainOfTheGuard.java index a62199e0be4..d81e96fa4c8 100644 --- a/Mage.Sets/src/mage/cards/a/AdrianaCaptainOfTheGuard.java +++ b/Mage.Sets/src/mage/cards/a/AdrianaCaptainOfTheGuard.java @@ -33,10 +33,7 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.MeleeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import java.util.UUID; @@ -50,8 +47,8 @@ public class AdrianaCaptainOfTheGuard extends CardImpl { public AdrianaCaptainOfTheGuard(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{W}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Human"); - this.subtype.add("Knight"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.KNIGHT); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AdroitHateflayer.java b/Mage.Sets/src/mage/cards/a/AdroitHateflayer.java index 4dadec6e038..313863d8afb 100644 --- a/Mage.Sets/src/mage/cards/a/AdroitHateflayer.java +++ b/Mage.Sets/src/mage/cards/a/AdroitHateflayer.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.MenaceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,8 +46,8 @@ public class AdroitHateflayer extends CardImpl { public AdroitHateflayer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{U}{B}{R}"); - this.subtype.add("Nautolan"); - this.subtype.add("Sith"); + this.subtype.add(SubType.NAUTOLAN); + this.subtype.add(SubType.SITH); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AdunOakenshield.java b/Mage.Sets/src/mage/cards/a/AdunOakenshield.java index f6dcf22cd11..7a413456672 100644 --- a/Mage.Sets/src/mage/cards/a/AdunOakenshield.java +++ b/Mage.Sets/src/mage/cards/a/AdunOakenshield.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; @@ -54,8 +55,8 @@ public class AdunOakenshield extends CardImpl { public AdunOakenshield(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{R}{G}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Human"); - this.subtype.add("Knight"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.KNIGHT); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AdvanceScout.java b/Mage.Sets/src/mage/cards/a/AdvanceScout.java index 9386a4ecb01..6fce02ad09c 100644 --- a/Mage.Sets/src/mage/cards/a/AdvanceScout.java +++ b/Mage.Sets/src/mage/cards/a/AdvanceScout.java @@ -35,10 +35,7 @@ import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Duration; -import mage.constants.Zone; +import mage.constants.*; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -51,9 +48,9 @@ public class AdvanceScout extends CardImpl { public AdvanceScout(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); - this.subtype.add("Scout"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); + this.subtype.add(SubType.SCOUT); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AdvancedHoverguard.java b/Mage.Sets/src/mage/cards/a/AdvancedHoverguard.java index f8356de3543..8172e7ad26c 100644 --- a/Mage.Sets/src/mage/cards/a/AdvancedHoverguard.java +++ b/Mage.Sets/src/mage/cards/a/AdvancedHoverguard.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -49,7 +50,7 @@ public class AdvancedHoverguard extends CardImpl { public AdvancedHoverguard(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}"); - this.subtype.add("Drone"); + this.subtype.add(SubType.DRONE); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AdvancedStitchwing.java b/Mage.Sets/src/mage/cards/a/AdvancedStitchwing.java index d42bc2ed03f..987d74e0062 100644 --- a/Mage.Sets/src/mage/cards/a/AdvancedStitchwing.java +++ b/Mage.Sets/src/mage/cards/a/AdvancedStitchwing.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.target.common.TargetCardInHand; @@ -51,8 +52,8 @@ public class AdvancedStitchwing extends CardImpl { public AdvancedStitchwing(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{U}"); - this.subtype.add("Zombie"); - this.subtype.add("Horror"); + this.subtype.add(SubType.ZOMBIE); + this.subtype.add(SubType.HORROR); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AdventuringGear.java b/Mage.Sets/src/mage/cards/a/AdventuringGear.java index 12223692029..288b0fe2c3e 100644 --- a/Mage.Sets/src/mage/cards/a/AdventuringGear.java +++ b/Mage.Sets/src/mage/cards/a/AdventuringGear.java @@ -37,6 +37,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; +import mage.constants.SubType; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -52,7 +53,7 @@ public class AdventuringGear extends CardImpl { public AdventuringGear(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); - this.subtype.add("Equipment"); + this.subtype.add(SubType.EQUIPMENT); this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(1))); this.addAbility(new AdventuringGearAbility()); } diff --git a/Mage.Sets/src/mage/cards/a/AdvocateOfTheBeast.java b/Mage.Sets/src/mage/cards/a/AdvocateOfTheBeast.java index a3840116951..90e8508cb11 100644 --- a/Mage.Sets/src/mage/cards/a/AdvocateOfTheBeast.java +++ b/Mage.Sets/src/mage/cards/a/AdvocateOfTheBeast.java @@ -59,8 +59,8 @@ public class AdvocateOfTheBeast extends CardImpl { public AdvocateOfTheBeast(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); - this.subtype.add("Elf"); - this.subtype.add("Shaman"); + this.subtype.add(SubType.ELF); + this.subtype.add(SubType.SHAMAN); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AegisAngel.java b/Mage.Sets/src/mage/cards/a/AegisAngel.java index c5afe3ec76d..60ff85ac985 100644 --- a/Mage.Sets/src/mage/cards/a/AegisAngel.java +++ b/Mage.Sets/src/mage/cards/a/AegisAngel.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.TargetPermanent; @@ -58,7 +59,7 @@ public class AegisAngel extends CardImpl { public AegisAngel(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{W}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AegisAutomaton.java b/Mage.Sets/src/mage/cards/a/AegisAutomaton.java index 3c14534ad38..df9143a3e64 100644 --- a/Mage.Sets/src/mage/cards/a/AegisAutomaton.java +++ b/Mage.Sets/src/mage/cards/a/AegisAutomaton.java @@ -35,6 +35,7 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; @@ -57,7 +58,7 @@ public class AegisAutomaton extends CardImpl { public AegisAutomaton(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{2}"); - this.subtype.add("Construct"); + this.subtype.add(SubType.CONSTRUCT); this.power = new MageInt(0); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AegisOfTheGods.java b/Mage.Sets/src/mage/cards/a/AegisOfTheGods.java index fe416284e6c..f9b7d073ed9 100644 --- a/Mage.Sets/src/mage/cards/a/AegisOfTheGods.java +++ b/Mage.Sets/src/mage/cards/a/AegisOfTheGods.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -47,8 +48,8 @@ public class AegisOfTheGods extends CardImpl { public AegisOfTheGods(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.CREATURE},"{1}{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AeonChronicler.java b/Mage.Sets/src/mage/cards/a/AeonChronicler.java index da2c876c7a2..ab5fd2219f8 100644 --- a/Mage.Sets/src/mage/cards/a/AeonChronicler.java +++ b/Mage.Sets/src/mage/cards/a/AeonChronicler.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; @@ -56,7 +57,7 @@ public class AeonChronicler extends CardImpl { public AeonChronicler(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{U}"); - this.subtype.add("Avatar"); + this.subtype.add(SubType.AVATAR); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/a/AerathiBerserker.java b/Mage.Sets/src/mage/cards/a/AerathiBerserker.java index 7e17be1e9cd..1cdb4ca387a 100644 --- a/Mage.Sets/src/mage/cards/a/AerathiBerserker.java +++ b/Mage.Sets/src/mage/cards/a/AerathiBerserker.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.RampageAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,8 +44,8 @@ public class AerathiBerserker extends CardImpl { public AerathiBerserker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}{R}"); - this.subtype.add("Human"); - this.subtype.add("Berserker"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.BERSERKER); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AerialGuide.java b/Mage.Sets/src/mage/cards/a/AerialGuide.java index 16529630787..c2abd15e5da 100644 --- a/Mage.Sets/src/mage/cards/a/AerialGuide.java +++ b/Mage.Sets/src/mage/cards/a/AerialGuide.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; @@ -37,10 +36,13 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.filter.common.FilterAttackingCreature; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetAttackingCreature; +import java.util.UUID; + /** * * @author ciaccona007 @@ -57,7 +59,7 @@ public class AerialGuide extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}"); - this.subtype.add("Drake"); + this.subtype.add(SubType.DRAKE); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AerialModification.java b/Mage.Sets/src/mage/cards/a/AerialModification.java index 9bf90f8a292..ba0286bcf59 100644 --- a/Mage.Sets/src/mage/cards/a/AerialModification.java +++ b/Mage.Sets/src/mage/cards/a/AerialModification.java @@ -63,7 +63,7 @@ public class AerialModification extends CardImpl { public AerialModification(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{W}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature or Vehicle TargetPermanent auraTarget = new TargetPermanent(filter); diff --git a/Mage.Sets/src/mage/cards/a/AerialResponder.java b/Mage.Sets/src/mage/cards/a/AerialResponder.java index 58c6a4c0b80..26e9fc70950 100644 --- a/Mage.Sets/src/mage/cards/a/AerialResponder.java +++ b/Mage.Sets/src/mage/cards/a/AerialResponder.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,8 +46,8 @@ public class AerialResponder extends CardImpl { public AerialResponder(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}"); - this.subtype.add("Dwarf"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.DWARF); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AerieBowmasters.java b/Mage.Sets/src/mage/cards/a/AerieBowmasters.java index bef91f7cfb8..d111dc388c2 100644 --- a/Mage.Sets/src/mage/cards/a/AerieBowmasters.java +++ b/Mage.Sets/src/mage/cards/a/AerieBowmasters.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,8 +46,8 @@ public class AerieBowmasters extends CardImpl { public AerieBowmasters(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}"); - this.subtype.add("Hound"); - this.subtype.add("Archer"); + this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.ARCHER); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AerieMystics.java b/Mage.Sets/src/mage/cards/a/AerieMystics.java index 8ad9e98a4e4..698e44b474b 100644 --- a/Mage.Sets/src/mage/cards/a/AerieMystics.java +++ b/Mage.Sets/src/mage/cards/a/AerieMystics.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,7 +37,11 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; + +import java.util.UUID; + import static mage.filter.StaticFilters.FILTER_PERMANENT_CREATURES; /** @@ -50,8 +53,8 @@ public class AerieMystics extends CardImpl { public AerieMystics(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{W}"); - this.subtype.add("Bird"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/cards/a/AerieOuphes.java b/Mage.Sets/src/mage/cards/a/AerieOuphes.java index 211f8d0a46c..0ccd3e8cb90 100644 --- a/Mage.Sets/src/mage/cards/a/AerieOuphes.java +++ b/Mage.Sets/src/mage/cards/a/AerieOuphes.java @@ -38,6 +38,7 @@ import mage.abilities.keyword.PersistAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; @@ -59,7 +60,7 @@ public class AerieOuphes extends CardImpl { public AerieOuphes(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}"); - this.subtype.add("Ouphe"); + this.subtype.add(SubType.OUPHE); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AerieWorshippers.java b/Mage.Sets/src/mage/cards/a/AerieWorshippers.java index c530c43095d..90919841491 100644 --- a/Mage.Sets/src/mage/cards/a/AerieWorshippers.java +++ b/Mage.Sets/src/mage/cards/a/AerieWorshippers.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; @@ -36,8 +35,11 @@ import mage.abilities.keyword.InspiredAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.game.permanent.token.AerieWorshippersBirdToken; +import java.util.UUID; + /** * * @author LevelX2 @@ -46,8 +48,8 @@ public class AerieWorshippers extends CardImpl { public AerieWorshippers(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}"); - this.subtype.add("Human"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AeronautAdmiral.java b/Mage.Sets/src/mage/cards/a/AeronautAdmiral.java index 319ba97a68c..f09534bcec8 100644 --- a/Mage.Sets/src/mage/cards/a/AeronautAdmiral.java +++ b/Mage.Sets/src/mage/cards/a/AeronautAdmiral.java @@ -57,8 +57,8 @@ public class AeronautAdmiral extends CardImpl { public AeronautAdmiral(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}"); - this.subtype.add("Human"); - this.subtype.add("Pilot"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.PILOT); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AeronautTinkerer.java b/Mage.Sets/src/mage/cards/a/AeronautTinkerer.java index 1bff0073d67..ce3ee879f4c 100644 --- a/Mage.Sets/src/mage/cards/a/AeronautTinkerer.java +++ b/Mage.Sets/src/mage/cards/a/AeronautTinkerer.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledArtifactPermanent; @@ -52,8 +53,8 @@ public class AeronautTinkerer extends CardImpl { public AeronautTinkerer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}"); - this.subtype.add("Human"); - this.subtype.add("Artificer"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.ARTIFICER); this.color.setBlue(true); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AesthirGlider.java b/Mage.Sets/src/mage/cards/a/AesthirGlider.java index 6c5e702ae6e..79096ebdd6c 100644 --- a/Mage.Sets/src/mage/cards/a/AesthirGlider.java +++ b/Mage.Sets/src/mage/cards/a/AesthirGlider.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,7 +45,7 @@ public class AesthirGlider extends CardImpl { public AesthirGlider(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{3}"); - this.subtype.add("Bird"); + this.subtype.add(SubType.BIRD); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AetherAdept.java b/Mage.Sets/src/mage/cards/a/AetherAdept.java index 0dcb96adae8..f03035ab74c 100644 --- a/Mage.Sets/src/mage/cards/a/AetherAdept.java +++ b/Mage.Sets/src/mage/cards/a/AetherAdept.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -46,8 +47,8 @@ public class AetherAdept extends CardImpl { public AetherAdept(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{U}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AetherChaser.java b/Mage.Sets/src/mage/cards/a/AetherChaser.java index 668608907f8..13bd2b38721 100644 --- a/Mage.Sets/src/mage/cards/a/AetherChaser.java +++ b/Mage.Sets/src/mage/cards/a/AetherChaser.java @@ -38,6 +38,7 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.game.permanent.token.ServoToken; import java.util.UUID; @@ -51,8 +52,8 @@ public class AetherChaser extends CardImpl { public AetherChaser(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}"); - this.subtype.add("Human"); - this.subtype.add("Artificer"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.ARTIFICER); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AetherFigment.java b/Mage.Sets/src/mage/cards/a/AetherFigment.java index 0b998bdf41c..355e83414c0 100644 --- a/Mage.Sets/src/mage/cards/a/AetherFigment.java +++ b/Mage.Sets/src/mage/cards/a/AetherFigment.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.KickerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.counters.CounterType; import java.util.UUID; @@ -48,7 +49,7 @@ public class AetherFigment extends CardImpl { public AetherFigment(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); - this.subtype.add("Illusion"); + this.subtype.add(SubType.ILLUSION); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AetherHerder.java b/Mage.Sets/src/mage/cards/a/AetherHerder.java index aa56408e762..3743cb06c1d 100644 --- a/Mage.Sets/src/mage/cards/a/AetherHerder.java +++ b/Mage.Sets/src/mage/cards/a/AetherHerder.java @@ -37,6 +37,7 @@ import mage.abilities.effects.common.counter.GetEnergyCountersControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.game.permanent.token.ServoToken; import java.util.UUID; @@ -50,9 +51,9 @@ public class AetherHerder extends CardImpl { public AetherHerder(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}"); - this.subtype.add("Elf"); - this.subtype.add("Artificer"); - this.subtype.add("Druid"); + this.subtype.add(SubType.ELF); + this.subtype.add(SubType.ARTIFICER); + this.subtype.add(SubType.DRUID); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AetherInspector.java b/Mage.Sets/src/mage/cards/a/AetherInspector.java index 47179e8e1e8..68d177ca169 100644 --- a/Mage.Sets/src/mage/cards/a/AetherInspector.java +++ b/Mage.Sets/src/mage/cards/a/AetherInspector.java @@ -38,6 +38,7 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.game.permanent.token.ServoToken; import java.util.UUID; @@ -51,8 +52,8 @@ public class AetherInspector extends CardImpl { public AetherInspector(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}"); - this.subtype.add("Dwarf"); - this.subtype.add("Artificer"); + this.subtype.add(SubType.DWARF); + this.subtype.add(SubType.ARTIFICER); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AetherMeltdown.java b/Mage.Sets/src/mage/cards/a/AetherMeltdown.java index e0d31d12bd3..21f1340b1ac 100644 --- a/Mage.Sets/src/mage/cards/a/AetherMeltdown.java +++ b/Mage.Sets/src/mage/cards/a/AetherMeltdown.java @@ -61,7 +61,7 @@ public class AetherMeltdown extends CardImpl { public AetherMeltdown(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Flash this.addAbility(FlashAbility.getInstance()); diff --git a/Mage.Sets/src/mage/cards/a/AetherMembrane.java b/Mage.Sets/src/mage/cards/a/AetherMembrane.java index 150489303a2..619b6bf5d7b 100644 --- a/Mage.Sets/src/mage/cards/a/AetherMembrane.java +++ b/Mage.Sets/src/mage/cards/a/AetherMembrane.java @@ -38,6 +38,7 @@ import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -49,7 +50,7 @@ public class AetherMembrane extends CardImpl { public AetherMembrane(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}{R}"); - this.subtype.add("Wall"); + this.subtype.add(SubType.WALL); this.power = new MageInt(0); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AetherPoisoner.java b/Mage.Sets/src/mage/cards/a/AetherPoisoner.java index 2f6ccfedd4e..c1f8e397502 100644 --- a/Mage.Sets/src/mage/cards/a/AetherPoisoner.java +++ b/Mage.Sets/src/mage/cards/a/AetherPoisoner.java @@ -38,6 +38,7 @@ import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.game.permanent.token.ServoToken; import java.util.UUID; @@ -51,8 +52,8 @@ public class AetherPoisoner extends CardImpl { public AetherPoisoner(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}"); - this.subtype.add("Human"); - this.subtype.add("Artificer"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.ARTIFICER); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AetherSwooper.java b/Mage.Sets/src/mage/cards/a/AetherSwooper.java index b941ab9043d..e84e1d7abf1 100644 --- a/Mage.Sets/src/mage/cards/a/AetherSwooper.java +++ b/Mage.Sets/src/mage/cards/a/AetherSwooper.java @@ -38,6 +38,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.game.permanent.token.ServoToken; import java.util.UUID; @@ -51,8 +52,8 @@ public class AetherSwooper extends CardImpl { public AetherSwooper(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}"); - this.subtype.add("Vedalken"); - this.subtype.add("Artificer"); + this.subtype.add(SubType.VEDALKEN); + this.subtype.add(SubType.ARTIFICER); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AetherTheorist.java b/Mage.Sets/src/mage/cards/a/AetherTheorist.java index 7cb52bb6aaa..1c43a73e026 100644 --- a/Mage.Sets/src/mage/cards/a/AetherTheorist.java +++ b/Mage.Sets/src/mage/cards/a/AetherTheorist.java @@ -38,6 +38,7 @@ import mage.abilities.effects.keyword.ScryEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -50,8 +51,8 @@ public class AetherTheorist extends CardImpl { public AetherTheorist(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); - this.subtype.add("Vedalken"); - this.subtype.add("Rogue"); + this.subtype.add(SubType.VEDALKEN); + this.subtype.add(SubType.ROGUE); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AetherbornMarauder.java b/Mage.Sets/src/mage/cards/a/AetherbornMarauder.java index 54f7f010aba..49558ee7204 100644 --- a/Mage.Sets/src/mage/cards/a/AetherbornMarauder.java +++ b/Mage.Sets/src/mage/cards/a/AetherbornMarauder.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.permanent.AnotherPredicate; @@ -56,8 +57,8 @@ public class AetherbornMarauder extends CardImpl { public AetherbornMarauder(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}"); - this.subtype.add("Aetherborn"); - this.subtype.add("Rogue"); + this.subtype.add(SubType.AETHERBORN); + this.subtype.add(SubType.ROGUE); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AethergeodeMiner.java b/Mage.Sets/src/mage/cards/a/AethergeodeMiner.java index cb1100d3913..71771346311 100644 --- a/Mage.Sets/src/mage/cards/a/AethergeodeMiner.java +++ b/Mage.Sets/src/mage/cards/a/AethergeodeMiner.java @@ -38,6 +38,7 @@ import mage.abilities.effects.common.counter.GetEnergyCountersControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -51,8 +52,8 @@ public class AethergeodeMiner extends CardImpl { public AethergeodeMiner(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}"); - this.subtype.add("Dwarf"); - this.subtype.add("Scout"); + this.subtype.add(SubType.DWARF); + this.subtype.add(SubType.SCOUT); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/Aetherling.java b/Mage.Sets/src/mage/cards/a/Aetherling.java index 2f5b3578b04..49b7c9ad25a 100644 --- a/Mage.Sets/src/mage/cards/a/Aetherling.java +++ b/Mage.Sets/src/mage/cards/a/Aetherling.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -49,7 +50,7 @@ public class Aetherling extends CardImpl { public Aetherling(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}{U}"); - this.subtype.add("Shapeshifter"); + this.subtype.add(SubType.SHAPESHIFTER); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/Aethersnipe.java b/Mage.Sets/src/mage/cards/a/Aethersnipe.java index c501395a13f..50f88e4faec 100644 --- a/Mage.Sets/src/mage/cards/a/Aethersnipe.java +++ b/Mage.Sets/src/mage/cards/a/Aethersnipe.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.EvokeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.target.Target; import mage.target.common.TargetNonlandPermanent; @@ -48,7 +49,7 @@ public class Aethersnipe extends CardImpl { public Aethersnipe(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{U}"); - this.subtype.add("Elemental"); + this.subtype.add(SubType.ELEMENTAL); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AethersphereHarvester.java b/Mage.Sets/src/mage/cards/a/AethersphereHarvester.java index 9505c773b9e..643b5a84ec4 100644 --- a/Mage.Sets/src/mage/cards/a/AethersphereHarvester.java +++ b/Mage.Sets/src/mage/cards/a/AethersphereHarvester.java @@ -40,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -53,7 +54,7 @@ public class AethersphereHarvester extends CardImpl { public AethersphereHarvester(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}"); - this.subtype.add("Vehicle"); + this.subtype.add(SubType.VEHICLE); this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AethersquallAncient.java b/Mage.Sets/src/mage/cards/a/AethersquallAncient.java index a001b309949..d666d761eee 100644 --- a/Mage.Sets/src/mage/cards/a/AethersquallAncient.java +++ b/Mage.Sets/src/mage/cards/a/AethersquallAncient.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; @@ -58,7 +59,7 @@ public class AethersquallAncient extends CardImpl { public AethersquallAncient(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{U}{U}"); - this.subtype.add("Leviathan"); + this.subtype.add(SubType.LEVIATHAN); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/AetherstormRoc.java b/Mage.Sets/src/mage/cards/a/AetherstormRoc.java index 660b527663c..c236e21c5fa 100644 --- a/Mage.Sets/src/mage/cards/a/AetherstormRoc.java +++ b/Mage.Sets/src/mage/cards/a/AetherstormRoc.java @@ -40,6 +40,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; @@ -58,7 +59,7 @@ public class AetherstormRoc extends CardImpl { public AetherstormRoc(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}"); - this.subtype.add("Bird"); + this.subtype.add(SubType.BIRD); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AetherstreamLeopard.java b/Mage.Sets/src/mage/cards/a/AetherstreamLeopard.java index 481d88251c1..678e99e3695 100644 --- a/Mage.Sets/src/mage/cards/a/AetherstreamLeopard.java +++ b/Mage.Sets/src/mage/cards/a/AetherstreamLeopard.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import java.util.UUID; @@ -51,7 +52,7 @@ public class AetherstreamLeopard extends CardImpl { public AetherstreamLeopard(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}"); - this.subtype.add("Cat"); + this.subtype.add(SubType.CAT); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AethertideWhale.java b/Mage.Sets/src/mage/cards/a/AethertideWhale.java index 35d5c957d8e..f190200de2b 100644 --- a/Mage.Sets/src/mage/cards/a/AethertideWhale.java +++ b/Mage.Sets/src/mage/cards/a/AethertideWhale.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -50,7 +51,7 @@ public class AethertideWhale extends CardImpl { public AethertideWhale(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{U}{U}"); - this.subtype.add("Whale"); + this.subtype.add(SubType.WHALE); this.power = new MageInt(6); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AethertorchRenegade.java b/Mage.Sets/src/mage/cards/a/AethertorchRenegade.java index bcb6b6e6c4b..e00e94f5a69 100644 --- a/Mage.Sets/src/mage/cards/a/AethertorchRenegade.java +++ b/Mage.Sets/src/mage/cards/a/AethertorchRenegade.java @@ -38,6 +38,7 @@ import mage.abilities.effects.common.counter.GetEnergyCountersControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; @@ -52,8 +53,8 @@ public class AethertorchRenegade extends CardImpl { public AethertorchRenegade(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); - this.subtype.add("Human"); - this.subtype.add("Rogue"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.ROGUE); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AetherwindBasker.java b/Mage.Sets/src/mage/cards/a/AetherwindBasker.java index 83841bac2bc..07c8c73c031 100644 --- a/Mage.Sets/src/mage/cards/a/AetherwindBasker.java +++ b/Mage.Sets/src/mage/cards/a/AetherwindBasker.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; @@ -53,7 +54,7 @@ public class AetherwindBasker extends CardImpl { public AetherwindBasker(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{G}{G}{G}"); - this.subtype.add("Lizard"); + this.subtype.add(SubType.LIZARD); this.power = new MageInt(7); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/a/AffaGuardHound.java b/Mage.Sets/src/mage/cards/a/AffaGuardHound.java index aadc5534527..5ca9b59bb92 100644 --- a/Mage.Sets/src/mage/cards/a/AffaGuardHound.java +++ b/Mage.Sets/src/mage/cards/a/AffaGuardHound.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -49,7 +50,7 @@ public class AffaGuardHound extends CardImpl { public AffaGuardHound (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.subtype.add("Hound"); + this.subtype.add(SubType.HOUND); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AffaProtector.java b/Mage.Sets/src/mage/cards/a/AffaProtector.java index d9444a06677..dca973c29e9 100644 --- a/Mage.Sets/src/mage/cards/a/AffaProtector.java +++ b/Mage.Sets/src/mage/cards/a/AffaProtector.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,9 +44,9 @@ public class AffaProtector extends CardImpl { public AffaProtector(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); - this.subtype.add("Ally"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); + this.subtype.add(SubType.ALLY); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AfflictedDeserter.java b/Mage.Sets/src/mage/cards/a/AfflictedDeserter.java index ca60b726550..6e9e7556370 100644 --- a/Mage.Sets/src/mage/cards/a/AfflictedDeserter.java +++ b/Mage.Sets/src/mage/cards/a/AfflictedDeserter.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.w.WerewolfRansacker; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.TargetController; import java.util.UUID; @@ -50,8 +51,8 @@ public class AfflictedDeserter extends CardImpl { public AfflictedDeserter(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); - this.subtype.add("Human"); - this.subtype.add("Werewolf"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WEREWOLF); this.transformable = true; this.secondSideCardClazz = WerewolfRansacker.class; diff --git a/Mage.Sets/src/mage/cards/a/AgadeemOccultist.java b/Mage.Sets/src/mage/cards/a/AgadeemOccultist.java index 8da5b4f9969..70176ff67be 100644 --- a/Mage.Sets/src/mage/cards/a/AgadeemOccultist.java +++ b/Mage.Sets/src/mage/cards/a/AgadeemOccultist.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -55,9 +56,9 @@ public class AgadeemOccultist extends CardImpl { public AgadeemOccultist(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}"); - this.subtype.add("Human"); - this.subtype.add("Shaman"); - this.subtype.add("Ally"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SHAMAN); + this.subtype.add(SubType.ALLY); this.power = new MageInt(0); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AgelessEntity.java b/Mage.Sets/src/mage/cards/a/AgelessEntity.java index 9d3c3e17d66..4d515fe1e95 100644 --- a/Mage.Sets/src/mage/cards/a/AgelessEntity.java +++ b/Mage.Sets/src/mage/cards/a/AgelessEntity.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.counters.CounterType; import mage.game.Game; @@ -49,7 +50,7 @@ public class AgelessEntity extends CardImpl { public AgelessEntity(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}"); - this.subtype.add("Elemental"); + this.subtype.add(SubType.ELEMENTAL); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AgentOfErebos.java b/Mage.Sets/src/mage/cards/a/AgentOfErebos.java index 7932161e1b9..fc94680c221 100644 --- a/Mage.Sets/src/mage/cards/a/AgentOfErebos.java +++ b/Mage.Sets/src/mage/cards/a/AgentOfErebos.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.ExileGraveyardAllTargetPlayerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.target.TargetPlayer; import java.util.UUID; @@ -46,7 +47,7 @@ public class AgentOfErebos extends CardImpl { public AgentOfErebos(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.CREATURE},"{3}{B}"); - this.subtype.add("Zombie"); + this.subtype.add(SubType.ZOMBIE); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AgentOfHorizons.java b/Mage.Sets/src/mage/cards/a/AgentOfHorizons.java index 3721d71c7b4..203c6751575 100644 --- a/Mage.Sets/src/mage/cards/a/AgentOfHorizons.java +++ b/Mage.Sets/src/mage/cards/a/AgentOfHorizons.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -47,8 +48,8 @@ public class AgentOfHorizons extends CardImpl { public AgentOfHorizons(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); - this.subtype.add("Human"); - this.subtype.add("Rogue"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.ROGUE); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AgentOfMasks.java b/Mage.Sets/src/mage/cards/a/AgentOfMasks.java index 82358f4e81c..596d7f66604 100644 --- a/Mage.Sets/src/mage/cards/a/AgentOfMasks.java +++ b/Mage.Sets/src/mage/cards/a/AgentOfMasks.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.TargetController; import mage.game.Game; @@ -48,8 +49,8 @@ public class AgentOfMasks extends CardImpl { public AgentOfMasks(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{B}"); - this.subtype.add("Human"); - this.subtype.add("Advisor"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.ADVISOR); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AgentOfShauku.java b/Mage.Sets/src/mage/cards/a/AgentOfShauku.java index 48067f7383e..6d6196290fb 100644 --- a/Mage.Sets/src/mage/cards/a/AgentOfShauku.java +++ b/Mage.Sets/src/mage/cards/a/AgentOfShauku.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; @@ -55,8 +56,8 @@ public class AgentOfShauku extends CardImpl { public AgentOfShauku(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}"); - this.subtype.add("Human"); - this.subtype.add("Mercenary"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.MERCENARY); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AgentOfStromgald.java b/Mage.Sets/src/mage/cards/a/AgentOfStromgald.java index 543af088c9b..cb1de55cf85 100644 --- a/Mage.Sets/src/mage/cards/a/AgentOfStromgald.java +++ b/Mage.Sets/src/mage/cards/a/AgentOfStromgald.java @@ -34,6 +34,7 @@ import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -46,8 +47,8 @@ public class AgentOfStromgald extends CardImpl { public AgentOfStromgald(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}"); - this.subtype.add("Human"); - this.subtype.add("Knight"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.KNIGHT); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AgentOfTheFates.java b/Mage.Sets/src/mage/cards/a/AgentOfTheFates.java index 524f7b9835b..02b36ee4839 100644 --- a/Mage.Sets/src/mage/cards/a/AgentOfTheFates.java +++ b/Mage.Sets/src/mage/cards/a/AgentOfTheFates.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.HeroicAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; import java.util.UUID; @@ -46,8 +47,8 @@ public class AgentOfTheFates extends CardImpl { public AgentOfTheFates(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{B}"); - this.subtype.add("Human"); - this.subtype.add("Assassin"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.ASSASSIN); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/Agility.java b/Mage.Sets/src/mage/cards/a/Agility.java index 4c8636bb2fc..e6d02fdd9f9 100644 --- a/Mage.Sets/src/mage/cards/a/Agility.java +++ b/Mage.Sets/src/mage/cards/a/Agility.java @@ -36,10 +36,7 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlankingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -53,7 +50,7 @@ public class Agility extends CardImpl { public Agility(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{R}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature diff --git a/Mage.Sets/src/mage/cards/a/Agoraphobia.java b/Mage.Sets/src/mage/cards/a/Agoraphobia.java index cae80146e36..2479e7bb2fe 100644 --- a/Mage.Sets/src/mage/cards/a/Agoraphobia.java +++ b/Mage.Sets/src/mage/cards/a/Agoraphobia.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -53,7 +54,7 @@ public class Agoraphobia extends CardImpl { public Agoraphobia(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature diff --git a/Mage.Sets/src/mage/cards/a/AgrusKosWojekVeteran.java b/Mage.Sets/src/mage/cards/a/AgrusKosWojekVeteran.java index b0d46b4f75e..d70f02b91bd 100644 --- a/Mage.Sets/src/mage/cards/a/AgrusKosWojekVeteran.java +++ b/Mage.Sets/src/mage/cards/a/AgrusKosWojekVeteran.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterAttackingCreature; import mage.filter.predicate.mageobject.ColorPredicate; @@ -59,8 +60,8 @@ public class AgrusKosWojekVeteran extends CardImpl { public AgrusKosWojekVeteran(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{W}"); this.addSuperType(SuperType.LEGENDARY); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AhnCropChampion.java b/Mage.Sets/src/mage/cards/a/AhnCropChampion.java index 2004cbf2fa1..008a3b107f8 100644 --- a/Mage.Sets/src/mage/cards/a/AhnCropChampion.java +++ b/Mage.Sets/src/mage/cards/a/AhnCropChampion.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BecomesExertSourceTriggeredAbility; import mage.abilities.effects.common.UntapAllControllerEffect; @@ -35,8 +34,10 @@ import mage.abilities.keyword.ExertAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; -import mage.filter.predicate.permanent.AnotherPredicate; + +import java.util.UUID; /** * @@ -46,8 +47,8 @@ public class AhnCropChampion extends CardImpl { public AhnCropChampion(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{W}"); - this.subtype.add("Human"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AhnCropCrasher.java b/Mage.Sets/src/mage/cards/a/AhnCropCrasher.java index d5710302ad5..cdcaf66f865 100644 --- a/Mage.Sets/src/mage/cards/a/AhnCropCrasher.java +++ b/Mage.Sets/src/mage/cards/a/AhnCropCrasher.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.BecomesExertSourceTriggeredAbility; import mage.abilities.effects.common.combat.CantBlockTargetEffect; @@ -37,8 +36,11 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -48,8 +50,8 @@ public class AhnCropCrasher extends CardImpl { public AhnCropCrasher(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}"); - this.subtype.add("Minotaur"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.MINOTAUR); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AinokArtillerist.java b/Mage.Sets/src/mage/cards/a/AinokArtillerist.java index 5e469030fd3..62e52498d6d 100644 --- a/Mage.Sets/src/mage/cards/a/AinokArtillerist.java +++ b/Mage.Sets/src/mage/cards/a/AinokArtillerist.java @@ -36,6 +36,7 @@ import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; @@ -49,8 +50,8 @@ public class AinokArtillerist extends CardImpl { public AinokArtillerist(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); - this.subtype.add("Hound"); - this.subtype.add("Archer"); + this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.ARCHER); this.power = new MageInt(4); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AinokBondKin.java b/Mage.Sets/src/mage/cards/a/AinokBondKin.java index 9465fee00f4..24889f84ba7 100644 --- a/Mage.Sets/src/mage/cards/a/AinokBondKin.java +++ b/Mage.Sets/src/mage/cards/a/AinokBondKin.java @@ -35,10 +35,7 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.keyword.OutlastAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -65,8 +62,8 @@ public class AinokBondKin extends CardImpl { public AinokBondKin(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Hound"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AinokGuide.java b/Mage.Sets/src/mage/cards/a/AinokGuide.java index 396392300b3..55b964b6eb6 100644 --- a/Mage.Sets/src/mage/cards/a/AinokGuide.java +++ b/Mage.Sets/src/mage/cards/a/AinokGuide.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.search.SearchLibraryPutOnLibraryEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterBasicLandCard; import mage.target.common.TargetCardInLibrary; @@ -50,8 +51,8 @@ public class AinokGuide extends CardImpl { public AinokGuide(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); - this.subtype.add("Hound"); - this.subtype.add("Scout"); + this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.SCOUT); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AinokSurvivalist.java b/Mage.Sets/src/mage/cards/a/AinokSurvivalist.java index 7c9b381a161..4cabf8d59da 100644 --- a/Mage.Sets/src/mage/cards/a/AinokSurvivalist.java +++ b/Mage.Sets/src/mage/cards/a/AinokSurvivalist.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.MorphAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -58,8 +59,8 @@ public class AinokSurvivalist extends CardImpl { public AinokSurvivalist(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); - this.subtype.add("Hound"); - this.subtype.add("Shaman"); + this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.SHAMAN); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AinokTracker.java b/Mage.Sets/src/mage/cards/a/AinokTracker.java index 97c5e7dac63..4ae87157021 100644 --- a/Mage.Sets/src/mage/cards/a/AinokTracker.java +++ b/Mage.Sets/src/mage/cards/a/AinokTracker.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.MorphAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,8 +46,8 @@ public class AinokTracker extends CardImpl { public AinokTracker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{R}"); - this.subtype.add("Hound"); - this.subtype.add("Scout"); + this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.SCOUT); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AirElemental.java b/Mage.Sets/src/mage/cards/a/AirElemental.java index fd5f1d825f7..2e3dac01d85 100644 --- a/Mage.Sets/src/mage/cards/a/AirElemental.java +++ b/Mage.Sets/src/mage/cards/a/AirElemental.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,7 +46,7 @@ public class AirElemental extends CardImpl { public AirElemental(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{U}"); - this.subtype.add("Elemental"); + this.subtype.add(SubType.ELEMENTAL); this.power = new MageInt(4); this.toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/cards/a/AirServant.java b/Mage.Sets/src/mage/cards/a/AirServant.java index 4ae643900e0..eb70861bb1b 100644 --- a/Mage.Sets/src/mage/cards/a/AirServant.java +++ b/Mage.Sets/src/mage/cards/a/AirServant.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; @@ -59,7 +60,7 @@ public class AirServant extends CardImpl { public AirServant(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}"); - this.subtype.add("Elemental"); + this.subtype.add(SubType.ELEMENTAL); this.power = new MageInt(4); this.toughness = new MageInt(3); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/cards/a/AirdropAeronauts.java b/Mage.Sets/src/mage/cards/a/AirdropAeronauts.java index 06c5df0a71d..5c66349f71b 100644 --- a/Mage.Sets/src/mage/cards/a/AirdropAeronauts.java +++ b/Mage.Sets/src/mage/cards/a/AirdropAeronauts.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; +import mage.constants.SubType; import mage.watchers.common.RevoltWatcher; import java.util.UUID; @@ -51,8 +52,8 @@ public class AirdropAeronauts extends CardImpl { public AirdropAeronauts(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}{W}"); - this.subtype.add("Dwarf"); - this.subtype.add("Scout"); + this.subtype.add(SubType.DWARF); + this.subtype.add(SubType.SCOUT); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AirdropCondor.java b/Mage.Sets/src/mage/cards/a/AirdropCondor.java index 12549667c8b..98e7c0dd57b 100644 --- a/Mage.Sets/src/mage/cards/a/AirdropCondor.java +++ b/Mage.Sets/src/mage/cards/a/AirdropCondor.java @@ -61,7 +61,7 @@ public class AirdropCondor extends CardImpl { public AirdropCondor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}"); - this.subtype.add("Bird"); + this.subtype.add(SubType.BIRD); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AislingLeprechaun.java b/Mage.Sets/src/mage/cards/a/AislingLeprechaun.java index a248deafc6b..6e27a76cc13 100644 --- a/Mage.Sets/src/mage/cards/a/AislingLeprechaun.java +++ b/Mage.Sets/src/mage/cards/a/AislingLeprechaun.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import java.util.UUID; @@ -48,7 +49,7 @@ public class AislingLeprechaun extends CardImpl { public AislingLeprechaun(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{G}"); - this.subtype.add("Faerie"); + this.subtype.add(SubType.FAERIE); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AjaniCallerOfThePride.java b/Mage.Sets/src/mage/cards/a/AjaniCallerOfThePride.java index 16b8637061d..b4a5b8697c0 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniCallerOfThePride.java +++ b/Mage.Sets/src/mage/cards/a/AjaniCallerOfThePride.java @@ -42,6 +42,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.counters.CounterType; import mage.game.permanent.token.CatToken; import mage.target.common.TargetCreaturePermanent; @@ -56,7 +57,7 @@ public class AjaniCallerOfThePride extends CardImpl { public AjaniCallerOfThePride(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.PLANESWALKER},"{1}{W}{W}"); - this.subtype.add("Ajani"); + this.subtype.add(SubType.AJANI); this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(4)); // +1: Put a +1/+1 counter on up to one target creature. diff --git a/Mage.Sets/src/mage/cards/a/AjaniGoldmane.java b/Mage.Sets/src/mage/cards/a/AjaniGoldmane.java index 3e56f465933..a6f07e7a719 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniGoldmane.java +++ b/Mage.Sets/src/mage/cards/a/AjaniGoldmane.java @@ -59,7 +59,7 @@ public class AjaniGoldmane extends CardImpl { public AjaniGoldmane(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, "{2}{W}{W}"); - this.subtype.add("Ajani"); + this.subtype.add(SubType.AJANI); this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(4)); @@ -93,7 +93,7 @@ class AvatarToken extends Token { public AvatarToken() { super("Avatar", "white Avatar creature token with \"This creature's power and toughness are each equal to your life total.\""); cardType.add(CardType.CREATURE); - subtype.add("Avatar"); + subtype.add(SubType.AVATAR); color.setWhite(true); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AvatarTokenEffect())); } diff --git a/Mage.Sets/src/mage/cards/a/AjaniMentorOfHeroes.java b/Mage.Sets/src/mage/cards/a/AjaniMentorOfHeroes.java index 07748b176f6..76cb528aa8e 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniMentorOfHeroes.java +++ b/Mage.Sets/src/mage/cards/a/AjaniMentorOfHeroes.java @@ -69,7 +69,7 @@ public class AjaniMentorOfHeroes extends CardImpl { public AjaniMentorOfHeroes(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.PLANESWALKER},"{3}{G}{W}"); - this.subtype.add("Ajani"); + this.subtype.add(SubType.AJANI); this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(4)); diff --git a/Mage.Sets/src/mage/cards/a/AjaniSteadfast.java b/Mage.Sets/src/mage/cards/a/AjaniSteadfast.java index 86c9a9df811..048902ffb6f 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniSteadfast.java +++ b/Mage.Sets/src/mage/cards/a/AjaniSteadfast.java @@ -41,6 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; @@ -66,7 +67,7 @@ public class AjaniSteadfast extends CardImpl { public AjaniSteadfast(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, "{3}{W}"); - this.subtype.add("Ajani"); + this.subtype.add(SubType.AJANI); this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(4)); diff --git a/Mage.Sets/src/mage/cards/a/AjaniUnyielding.java b/Mage.Sets/src/mage/cards/a/AjaniUnyielding.java index dc3140afb45..ac6f5086f17 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniUnyielding.java +++ b/Mage.Sets/src/mage/cards/a/AjaniUnyielding.java @@ -35,6 +35,7 @@ import mage.abilities.effects.common.counter.AddCountersAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.counters.CounterType; @@ -65,7 +66,7 @@ public class AjaniUnyielding extends CardImpl { public AjaniUnyielding(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, "{4}{G}{W}"); - this.subtype.add("Ajani"); + this.subtype.add(SubType.AJANI); this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(4)); diff --git a/Mage.Sets/src/mage/cards/a/AjaniValiantProtector.java b/Mage.Sets/src/mage/cards/a/AjaniValiantProtector.java index 343cc6bb991..87f4172568f 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniValiantProtector.java +++ b/Mage.Sets/src/mage/cards/a/AjaniValiantProtector.java @@ -40,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreatureCard; @@ -55,7 +56,7 @@ public class AjaniValiantProtector extends CardImpl { public AjaniValiantProtector(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, "{4}{G}{W}"); - this.subtype.add("Ajani"); + this.subtype.add(SubType.AJANI); this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(4)); diff --git a/Mage.Sets/src/mage/cards/a/AjaniVengeant.java b/Mage.Sets/src/mage/cards/a/AjaniVengeant.java index cb2674bb2b4..5495187f763 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniVengeant.java +++ b/Mage.Sets/src/mage/cards/a/AjaniVengeant.java @@ -37,6 +37,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetPermanent; @@ -59,7 +60,7 @@ public class AjaniVengeant extends CardImpl { public AjaniVengeant(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.PLANESWALKER},"{2}{R}{W}"); - this.subtype.add("Ajani"); + this.subtype.add(SubType.AJANI); this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(3)); diff --git a/Mage.Sets/src/mage/cards/a/AjanisChosen.java b/Mage.Sets/src/mage/cards/a/AjanisChosen.java index 3d8b77fd6de..959c8c61f7e 100644 --- a/Mage.Sets/src/mage/cards/a/AjanisChosen.java +++ b/Mage.Sets/src/mage/cards/a/AjanisChosen.java @@ -33,10 +33,7 @@ import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SetTargetPointer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledEnchantmentPermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -54,8 +51,8 @@ public class AjanisChosen extends CardImpl { public AjanisChosen(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}{W}"); - this.subtype.add("Cat"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.CAT); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AjanisComrade.java b/Mage.Sets/src/mage/cards/a/AjanisComrade.java index a77b909449d..4266964cf73 100644 --- a/Mage.Sets/src/mage/cards/a/AjanisComrade.java +++ b/Mage.Sets/src/mage/cards/a/AjanisComrade.java @@ -61,8 +61,8 @@ public class AjanisComrade extends CardImpl { public AjanisComrade(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}"); - this.subtype.add("Elf"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.ELF); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AjanisPridemate.java b/Mage.Sets/src/mage/cards/a/AjanisPridemate.java index 653b9ecf45b..3f25772772a 100644 --- a/Mage.Sets/src/mage/cards/a/AjanisPridemate.java +++ b/Mage.Sets/src/mage/cards/a/AjanisPridemate.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; @@ -50,8 +51,8 @@ public class AjanisPridemate extends CardImpl { public AjanisPridemate(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Cat"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.CAT); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AjanisSunstriker.java b/Mage.Sets/src/mage/cards/a/AjanisSunstriker.java index 8569d08b680..f5402d410c9 100644 --- a/Mage.Sets/src/mage/cards/a/AjanisSunstriker.java +++ b/Mage.Sets/src/mage/cards/a/AjanisSunstriker.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,8 +44,8 @@ public class AjanisSunstriker extends CardImpl { public AjanisSunstriker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}"); - this.subtype.add("Cat"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.CAT); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AkiriLineSlinger.java b/Mage.Sets/src/mage/cards/a/AkiriLineSlinger.java index 471cc84f1b3..8057bc8608a 100644 --- a/Mage.Sets/src/mage/cards/a/AkiriLineSlinger.java +++ b/Mage.Sets/src/mage/cards/a/AkiriLineSlinger.java @@ -38,10 +38,7 @@ import mage.abilities.keyword.PartnerAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -63,9 +60,9 @@ public class AkiriLineSlinger extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{R}{W}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Kor"); - this.subtype.add("Soldier"); - this.subtype.add("Ally"); + this.subtype.add(SubType.KOR); + this.subtype.add(SubType.SOLDIER); + this.subtype.add(SubType.ALLY); this.power = new MageInt(0); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AkkiAvalanchers.java b/Mage.Sets/src/mage/cards/a/AkkiAvalanchers.java index 4d651ca6a92..cb4b05d1dae 100644 --- a/Mage.Sets/src/mage/cards/a/AkkiAvalanchers.java +++ b/Mage.Sets/src/mage/cards/a/AkkiAvalanchers.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; @@ -52,8 +53,8 @@ public class AkkiAvalanchers extends CardImpl { public AkkiAvalanchers(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}"); - this.subtype.add("Goblin"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.GOBLIN); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AkkiBlizzardHerder.java b/Mage.Sets/src/mage/cards/a/AkkiBlizzardHerder.java index 37895fdc630..23c9a5eb664 100644 --- a/Mage.Sets/src/mage/cards/a/AkkiBlizzardHerder.java +++ b/Mage.Sets/src/mage/cards/a/AkkiBlizzardHerder.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.SacrificeAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; @@ -48,8 +49,8 @@ public class AkkiBlizzardHerder extends CardImpl { public AkkiBlizzardHerder(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}"); - this.subtype.add("Goblin"); - this.subtype.add("Shaman"); + this.subtype.add(SubType.GOBLIN); + this.subtype.add(SubType.SHAMAN); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AkkiCoalflinger.java b/Mage.Sets/src/mage/cards/a/AkkiCoalflinger.java index 44d3fcb4218..c7fc50dcade 100644 --- a/Mage.Sets/src/mage/cards/a/AkkiCoalflinger.java +++ b/Mage.Sets/src/mage/cards/a/AkkiCoalflinger.java @@ -37,10 +37,7 @@ import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Duration; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterAttackingCreature; import java.util.UUID; @@ -54,8 +51,8 @@ public class AkkiCoalflinger extends CardImpl { public AkkiCoalflinger (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{R}"); - this.subtype.add("Goblin"); - this.subtype.add("Shaman"); + this.subtype.add(SubType.GOBLIN); + this.subtype.add(SubType.SHAMAN); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AkkiDrillmaster.java b/Mage.Sets/src/mage/cards/a/AkkiDrillmaster.java index 7a6a4ada021..2aef3143d90 100644 --- a/Mage.Sets/src/mage/cards/a/AkkiDrillmaster.java +++ b/Mage.Sets/src/mage/cards/a/AkkiDrillmaster.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; @@ -50,8 +51,8 @@ public class AkkiDrillmaster extends CardImpl { public AkkiDrillmaster(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); - this.subtype.add("Goblin"); - this.subtype.add("Shaman"); + this.subtype.add(SubType.GOBLIN); + this.subtype.add(SubType.SHAMAN); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AkkiLavarunner.java b/Mage.Sets/src/mage/cards/a/AkkiLavarunner.java index a2d311034b7..4e5907f6705 100644 --- a/Mage.Sets/src/mage/cards/a/AkkiLavarunner.java +++ b/Mage.Sets/src/mage/cards/a/AkkiLavarunner.java @@ -29,8 +29,8 @@ public class AkkiLavarunner extends CardImpl { public AkkiLavarunner(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); - this.subtype.add("Goblin"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.GOBLIN); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(1); this.toughness = new MageInt(1); @@ -91,8 +91,8 @@ class TokTokVolcanoBorn extends Token { addSuperType(SuperType.LEGENDARY); cardType.add(CardType.CREATURE); color.setRed(true); - subtype.add("Goblin"); - subtype.add("Shaman"); + subtype.add(SubType.GOBLIN); + subtype.add(SubType.SHAMAN); power = new MageInt(2); toughness = new MageInt(2); this.addAbility(ProtectionAbility.from(ObjectColor.RED)); diff --git a/Mage.Sets/src/mage/cards/a/AkkiRaider.java b/Mage.Sets/src/mage/cards/a/AkkiRaider.java index 1ab5b270a64..94f04b3201a 100644 --- a/Mage.Sets/src/mage/cards/a/AkkiRaider.java +++ b/Mage.Sets/src/mage/cards/a/AkkiRaider.java @@ -34,6 +34,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandPermanent; @@ -47,8 +48,8 @@ public class AkkiRaider extends CardImpl { public AkkiRaider(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}"); - this.subtype.add("Goblin"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.GOBLIN); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AkkiRockspeaker.java b/Mage.Sets/src/mage/cards/a/AkkiRockspeaker.java index 519cf821aad..968ba46e3e9 100644 --- a/Mage.Sets/src/mage/cards/a/AkkiRockspeaker.java +++ b/Mage.Sets/src/mage/cards/a/AkkiRockspeaker.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ColoredManaSymbol; +import mage.constants.SubType; import java.util.UUID; @@ -45,8 +46,8 @@ public class AkkiRockspeaker extends CardImpl { public AkkiRockspeaker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}"); - this.subtype.add("Goblin"); - this.subtype.add("Shaman"); + this.subtype.add(SubType.GOBLIN); + this.subtype.add(SubType.SHAMAN); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AkkiUnderling.java b/Mage.Sets/src/mage/cards/a/AkkiUnderling.java index f7170621862..c4bb1edd8d6 100644 --- a/Mage.Sets/src/mage/cards/a/AkkiUnderling.java +++ b/Mage.Sets/src/mage/cards/a/AkkiUnderling.java @@ -29,7 +29,7 @@ package mage.cards.a; import mage.MageInt; import mage.abilities.Ability; -import mage.constants.ComparisonType; +import mage.constants.*; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.CardsInHandCondition; @@ -39,9 +39,6 @@ import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import java.util.UUID; @@ -53,8 +50,8 @@ public class AkkiUnderling extends CardImpl { public AkkiUnderling(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}"); - this.subtype.add("Goblin"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.GOBLIN); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AkkiUnderminer.java b/Mage.Sets/src/mage/cards/a/AkkiUnderminer.java index 2b9bc880bf7..36eb4760b6a 100644 --- a/Mage.Sets/src/mage/cards/a/AkkiUnderminer.java +++ b/Mage.Sets/src/mage/cards/a/AkkiUnderminer.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.SacrificeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterPermanent; import java.util.UUID; @@ -46,9 +47,9 @@ public class AkkiUnderminer extends CardImpl { public AkkiUnderminer (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); - this.subtype.add("Goblin"); - this.subtype.add("Rogue"); - this.subtype.add("Shaman"); + this.subtype.add(SubType.GOBLIN); + this.subtype.add(SubType.ROGUE); + this.subtype.add(SubType.SHAMAN); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AkoumBattlesinger.java b/Mage.Sets/src/mage/cards/a/AkoumBattlesinger.java index e6ddb37fa99..ad8b56fbedd 100644 --- a/Mage.Sets/src/mage/cards/a/AkoumBattlesinger.java +++ b/Mage.Sets/src/mage/cards/a/AkoumBattlesinger.java @@ -58,9 +58,9 @@ public class AkoumBattlesinger extends CardImpl { public AkoumBattlesinger(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}"); - this.subtype.add("Human"); - this.subtype.add("Berserker"); - this.subtype.add("Ally"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.BERSERKER); + this.subtype.add(SubType.ALLY); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AkoumBoulderfoot.java b/Mage.Sets/src/mage/cards/a/AkoumBoulderfoot.java index fb57ee8bf0b..ab48e87419e 100644 --- a/Mage.Sets/src/mage/cards/a/AkoumBoulderfoot.java +++ b/Mage.Sets/src/mage/cards/a/AkoumBoulderfoot.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.target.Target; import mage.target.common.TargetCreatureOrPlayer; @@ -47,8 +48,8 @@ public class AkoumBoulderfoot extends CardImpl { public AkoumBoulderfoot(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}{R}"); - this.subtype.add("Giant"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.GIANT); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AkoumFirebird.java b/Mage.Sets/src/mage/cards/a/AkoumFirebird.java index 4c125f66b53..5d360c27519 100644 --- a/Mage.Sets/src/mage/cards/a/AkoumFirebird.java +++ b/Mage.Sets/src/mage/cards/a/AkoumFirebird.java @@ -39,6 +39,7 @@ import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -54,7 +55,7 @@ public class AkoumFirebird extends CardImpl { public AkoumFirebird(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); - this.subtype.add("Phoenix"); + this.subtype.add(SubType.PHOENIX); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AkoumFlameseeker.java b/Mage.Sets/src/mage/cards/a/AkoumFlameseeker.java index be2220a011c..4a81e9e7a31 100644 --- a/Mage.Sets/src/mage/cards/a/AkoumFlameseeker.java +++ b/Mage.Sets/src/mage/cards/a/AkoumFlameseeker.java @@ -62,9 +62,9 @@ public class AkoumFlameseeker extends CardImpl { public AkoumFlameseeker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); - this.subtype.add("Human"); - this.subtype.add("Shaman"); - this.subtype.add("Ally"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SHAMAN); + this.subtype.add(SubType.ALLY); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AkoumHellkite.java b/Mage.Sets/src/mage/cards/a/AkoumHellkite.java index d0b76e4b787..9277160de8c 100644 --- a/Mage.Sets/src/mage/cards/a/AkoumHellkite.java +++ b/Mage.Sets/src/mage/cards/a/AkoumHellkite.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -55,7 +56,7 @@ public class AkoumHellkite extends CardImpl { public AkoumHellkite(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}{R}"); - this.subtype.add("Dragon"); + this.subtype.add(SubType.DRAGON); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AkoumStonewaker.java b/Mage.Sets/src/mage/cards/a/AkoumStonewaker.java index 2cad7a01817..309b9890915 100644 --- a/Mage.Sets/src/mage/cards/a/AkoumStonewaker.java +++ b/Mage.Sets/src/mage/cards/a/AkoumStonewaker.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LandfallAbility; @@ -39,9 +38,12 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.game.Game; import mage.game.permanent.token.AkoumStonewakerElementalToken; +import java.util.UUID; + /** * * @author LevelX2 @@ -50,8 +52,8 @@ public class AkoumStonewaker extends CardImpl { public AkoumStonewaker(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}"); - this.subtype.add("Human"); - this.subtype.add("Shaman"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SHAMAN); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AkrasanSquire.java b/Mage.Sets/src/mage/cards/a/AkrasanSquire.java index de3ecf4b90e..2d943a56964 100644 --- a/Mage.Sets/src/mage/cards/a/AkrasanSquire.java +++ b/Mage.Sets/src/mage/cards/a/AkrasanSquire.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.ExaltedAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,8 +45,8 @@ public class AkrasanSquire extends CardImpl { public AkrasanSquire (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AkroanConscriptor.java b/Mage.Sets/src/mage/cards/a/AkroanConscriptor.java index bd3222c49c6..040e295ea37 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanConscriptor.java +++ b/Mage.Sets/src/mage/cards/a/AkroanConscriptor.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetCreaturePermanent; @@ -59,8 +60,8 @@ public class AkroanConscriptor extends CardImpl { public AkroanConscriptor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}"); - this.subtype.add("Human"); - this.subtype.add("Shaman"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SHAMAN); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AkroanCrusader.java b/Mage.Sets/src/mage/cards/a/AkroanCrusader.java index c885edcf084..5431cc5969b 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanCrusader.java +++ b/Mage.Sets/src/mage/cards/a/AkroanCrusader.java @@ -27,15 +27,17 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.HeroicAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.game.permanent.token.AkroanSoldierToken; +import java.util.UUID; + /** * * @author Plopman @@ -44,8 +46,8 @@ public class AkroanCrusader extends CardImpl { public AkroanCrusader(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{R}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AkroanHoplite.java b/Mage.Sets/src/mage/cards/a/AkroanHoplite.java index 0c6a699c8a0..35101b91df3 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanHoplite.java +++ b/Mage.Sets/src/mage/cards/a/AkroanHoplite.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AttackingPredicate; @@ -57,8 +58,8 @@ public class AkroanHoplite extends CardImpl { public AkroanHoplite(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AkroanHorse.java b/Mage.Sets/src/mage/cards/a/AkroanHorse.java index 1df6f76299e..86a58f6b22c 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanHorse.java +++ b/Mage.Sets/src/mage/cards/a/AkroanHorse.java @@ -58,7 +58,7 @@ public class AkroanHorse extends CardImpl { public AkroanHorse(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{4}"); - this.subtype.add("Horse"); + this.subtype.add(SubType.HORSE); this.power = new MageInt(0); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AkroanJailer.java b/Mage.Sets/src/mage/cards/a/AkroanJailer.java index 1030e85222b..d5b5e3bc2cc 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanJailer.java +++ b/Mage.Sets/src/mage/cards/a/AkroanJailer.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; @@ -49,8 +50,8 @@ public class AkroanJailer extends CardImpl { public AkroanJailer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AkroanLineBreaker.java b/Mage.Sets/src/mage/cards/a/AkroanLineBreaker.java index 367f46a9fe8..3a07d64e310 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanLineBreaker.java +++ b/Mage.Sets/src/mage/cards/a/AkroanLineBreaker.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import java.util.UUID; @@ -49,8 +50,8 @@ public class AkroanLineBreaker extends CardImpl { public AkroanLineBreaker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); - this.subtype.add("Human"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AkroanMastiff.java b/Mage.Sets/src/mage/cards/a/AkroanMastiff.java index b39ac72d0b5..a8edb4905b1 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanMastiff.java +++ b/Mage.Sets/src/mage/cards/a/AkroanMastiff.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; @@ -49,7 +50,7 @@ public class AkroanMastiff extends CardImpl { public AkroanMastiff(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add("Hound"); + this.subtype.add(SubType.HOUND); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AkroanPhalanx.java b/Mage.Sets/src/mage/cards/a/AkroanPhalanx.java index e9705c4816a..f3a3ea64875 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanPhalanx.java +++ b/Mage.Sets/src/mage/cards/a/AkroanPhalanx.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -48,8 +49,8 @@ public class AkroanPhalanx extends CardImpl { public AkroanPhalanx(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AkroanSergeant.java b/Mage.Sets/src/mage/cards/a/AkroanSergeant.java index b1478198d93..5b3a2104e76 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanSergeant.java +++ b/Mage.Sets/src/mage/cards/a/AkroanSergeant.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.RenownAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,8 +45,8 @@ public class AkroanSergeant extends CardImpl { public AkroanSergeant(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AkroanSkyguard.java b/Mage.Sets/src/mage/cards/a/AkroanSkyguard.java index 7be07b8f238..d79fae23523 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanSkyguard.java +++ b/Mage.Sets/src/mage/cards/a/AkroanSkyguard.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.HeroicAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.counters.CounterType; import java.util.UUID; @@ -46,8 +47,8 @@ public class AkroanSkyguard extends CardImpl { public AkroanSkyguard(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AkromaAngelOfFury.java b/Mage.Sets/src/mage/cards/a/AkromaAngelOfFury.java index d43e1a9f7c6..1c001baf749 100644 --- a/Mage.Sets/src/mage/cards/a/AkromaAngelOfFury.java +++ b/Mage.Sets/src/mage/cards/a/AkromaAngelOfFury.java @@ -39,10 +39,7 @@ import mage.abilities.keyword.ProtectionAbility; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import java.util.UUID; @@ -55,7 +52,7 @@ public class AkromaAngelOfFury extends CardImpl { public AkromaAngelOfFury(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{R}{R}{R}"); this.addSuperType(SuperType.LEGENDARY); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/AkromaAngelOfWrath.java b/Mage.Sets/src/mage/cards/a/AkromaAngelOfWrath.java index 75652af6787..8459e6a42a2 100644 --- a/Mage.Sets/src/mage/cards/a/AkromaAngelOfWrath.java +++ b/Mage.Sets/src/mage/cards/a/AkromaAngelOfWrath.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.*; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; import java.util.UUID; @@ -46,7 +47,7 @@ public class AkromaAngelOfWrath extends CardImpl { public AkromaAngelOfWrath(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}{W}{W}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/AkromasDevoted.java b/Mage.Sets/src/mage/cards/a/AkromasDevoted.java index fdf77245f2f..4a2d83fb249 100644 --- a/Mage.Sets/src/mage/cards/a/AkromasDevoted.java +++ b/Mage.Sets/src/mage/cards/a/AkromasDevoted.java @@ -49,8 +49,8 @@ public class AkromasDevoted extends CardImpl { public AkromasDevoted(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add("Human"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AkronLegionnaire.java b/Mage.Sets/src/mage/cards/a/AkronLegionnaire.java index a1d2647f019..a281151814f 100644 --- a/Mage.Sets/src/mage/cards/a/AkronLegionnaire.java +++ b/Mage.Sets/src/mage/cards/a/AkronLegionnaire.java @@ -33,10 +33,7 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.common.combat.CantAttackAnyPlayerAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -61,8 +58,8 @@ public class AkronLegionnaire extends CardImpl { public AkronLegionnaire(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{6}{W}{W}"); - this.subtype.add("Giant"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.GIANT); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(8); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AkutaBornOfAsh.java b/Mage.Sets/src/mage/cards/a/AkutaBornOfAsh.java index d555d24c2fc..820d0550575 100644 --- a/Mage.Sets/src/mage/cards/a/AkutaBornOfAsh.java +++ b/Mage.Sets/src/mage/cards/a/AkutaBornOfAsh.java @@ -59,7 +59,7 @@ public class AkutaBornOfAsh extends CardImpl { public AkutaBornOfAsh(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Spirit"); + this.subtype.add(SubType.SPIRIT); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AlabasterDragon.java b/Mage.Sets/src/mage/cards/a/AlabasterDragon.java index 35803861f8c..2b71760ba82 100644 --- a/Mage.Sets/src/mage/cards/a/AlabasterDragon.java +++ b/Mage.Sets/src/mage/cards/a/AlabasterDragon.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,7 +46,7 @@ public class AlabasterDragon extends CardImpl { public AlabasterDragon(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}{W}"); - this.subtype.add("Dragon"); + this.subtype.add(SubType.DRAGON); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AlabasterKirin.java b/Mage.Sets/src/mage/cards/a/AlabasterKirin.java index 55c58bd15d4..d8809672bde 100644 --- a/Mage.Sets/src/mage/cards/a/AlabasterKirin.java +++ b/Mage.Sets/src/mage/cards/a/AlabasterKirin.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,7 +45,7 @@ public class AlabasterKirin extends CardImpl { public AlabasterKirin(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add("Kirin"); + this.subtype.add(SubType.KIRIN); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AlabasterLeech.java b/Mage.Sets/src/mage/cards/a/AlabasterLeech.java index 149cb056999..8066e373ac2 100644 --- a/Mage.Sets/src/mage/cards/a/AlabasterLeech.java +++ b/Mage.Sets/src/mage/cards/a/AlabasterLeech.java @@ -35,6 +35,7 @@ import mage.abilities.effects.common.cost.SpellsCostIncreasementControllerEffect import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; @@ -55,7 +56,7 @@ public class AlabasterLeech extends CardImpl { public AlabasterLeech(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}"); - this.subtype.add("Leech"); + this.subtype.add(SubType.LEECH); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AlabasterMage.java b/Mage.Sets/src/mage/cards/a/AlabasterMage.java index 60dd7457582..9675a1436bd 100644 --- a/Mage.Sets/src/mage/cards/a/AlabasterMage.java +++ b/Mage.Sets/src/mage/cards/a/AlabasterMage.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; @@ -50,8 +51,8 @@ public class AlabasterMage extends CardImpl { public AlabasterMage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AlabasterWall.java b/Mage.Sets/src/mage/cards/a/AlabasterWall.java index eb86cc4e8c0..590490679a8 100644 --- a/Mage.Sets/src/mage/cards/a/AlabasterWall.java +++ b/Mage.Sets/src/mage/cards/a/AlabasterWall.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; @@ -50,7 +51,7 @@ public class AlabasterWall extends CardImpl { public AlabasterWall(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.subtype.add("Wall"); + this.subtype.add(SubType.WALL); this.power = new MageInt(0); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AlabornCavalier.java b/Mage.Sets/src/mage/cards/a/AlabornCavalier.java index fb25b0e1723..af612f0cb25 100644 --- a/Mage.Sets/src/mage/cards/a/AlabornCavalier.java +++ b/Mage.Sets/src/mage/cards/a/AlabornCavalier.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -46,8 +47,8 @@ public class AlabornCavalier extends CardImpl { public AlabornCavalier(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}"); - this.subtype.add("Human"); - this.subtype.add("Knight"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.KNIGHT); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AlabornGrenadier.java b/Mage.Sets/src/mage/cards/a/AlabornGrenadier.java index 56c0b24267d..8c903b273a5 100644 --- a/Mage.Sets/src/mage/cards/a/AlabornGrenadier.java +++ b/Mage.Sets/src/mage/cards/a/AlabornGrenadier.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,8 +44,8 @@ public class AlabornGrenadier extends CardImpl { public AlabornGrenadier(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AlabornMusketeer.java b/Mage.Sets/src/mage/cards/a/AlabornMusketeer.java index 31e513c7c34..133e01ec3ca 100644 --- a/Mage.Sets/src/mage/cards/a/AlabornMusketeer.java +++ b/Mage.Sets/src/mage/cards/a/AlabornMusketeer.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,8 +44,8 @@ public class AlabornMusketeer extends CardImpl { public AlabornMusketeer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AlabornTrooper.java b/Mage.Sets/src/mage/cards/a/AlabornTrooper.java index d2f7e2860a6..9214c71453c 100644 --- a/Mage.Sets/src/mage/cards/a/AlabornTrooper.java +++ b/Mage.Sets/src/mage/cards/a/AlabornTrooper.java @@ -31,6 +31,7 @@ import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -42,8 +43,8 @@ public class AlabornTrooper extends CardImpl { public AlabornTrooper(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AlabornVeteran.java b/Mage.Sets/src/mage/cards/a/AlabornVeteran.java index 478f7db6b8d..b60d1afb391 100644 --- a/Mage.Sets/src/mage/cards/a/AlabornVeteran.java +++ b/Mage.Sets/src/mage/cards/a/AlabornVeteran.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; @@ -50,8 +51,8 @@ public class AlabornVeteran extends CardImpl { public AlabornVeteran(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.subtype.add("Human"); - this.subtype.add("Knight"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.KNIGHT); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/Aladdin.java b/Mage.Sets/src/mage/cards/a/Aladdin.java index 9021c58183b..b6420eb7e44 100644 --- a/Mage.Sets/src/mage/cards/a/Aladdin.java +++ b/Mage.Sets/src/mage/cards/a/Aladdin.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetArtifactPermanent; @@ -52,8 +53,8 @@ public class Aladdin extends CardImpl { public Aladdin(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); - this.subtype.add("Human"); - this.subtype.add("Rogue"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.ROGUE); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AlbinoTroll.java b/Mage.Sets/src/mage/cards/a/AlbinoTroll.java index 9f092a3278f..f0a614ce4ca 100644 --- a/Mage.Sets/src/mage/cards/a/AlbinoTroll.java +++ b/Mage.Sets/src/mage/cards/a/AlbinoTroll.java @@ -36,6 +36,7 @@ import mage.abilities.keyword.EchoAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -48,7 +49,7 @@ public class AlbinoTroll extends CardImpl { public AlbinoTroll(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); - this.subtype.add("Troll"); + this.subtype.add(SubType.TROLL); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AlchemistsApprentice.java b/Mage.Sets/src/mage/cards/a/AlchemistsApprentice.java index 41988c0a3c7..469982b5f37 100644 --- a/Mage.Sets/src/mage/cards/a/AlchemistsApprentice.java +++ b/Mage.Sets/src/mage/cards/a/AlchemistsApprentice.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -46,8 +47,8 @@ public class AlchemistsApprentice extends CardImpl { public AlchemistsApprentice(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AlertShuInfantry.java b/Mage.Sets/src/mage/cards/a/AlertShuInfantry.java index 1dd8acd3d42..f251ccd8946 100644 --- a/Mage.Sets/src/mage/cards/a/AlertShuInfantry.java +++ b/Mage.Sets/src/mage/cards/a/AlertShuInfantry.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,8 +44,8 @@ public class AlertShuInfantry extends CardImpl { public AlertShuInfantry(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AleshaWhoSmilesAtDeath.java b/Mage.Sets/src/mage/cards/a/AleshaWhoSmilesAtDeath.java index 54390ae3e3b..91f53948f5b 100644 --- a/Mage.Sets/src/mage/cards/a/AleshaWhoSmilesAtDeath.java +++ b/Mage.Sets/src/mage/cards/a/AleshaWhoSmilesAtDeath.java @@ -29,7 +29,7 @@ package mage.cards.a; import mage.MageInt; import mage.abilities.Ability; -import mage.constants.ComparisonType; +import mage.constants.*; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; @@ -38,10 +38,6 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SuperType; -import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.PowerPredicate; import mage.game.Game; @@ -65,8 +61,8 @@ public class AleshaWhoSmilesAtDeath extends CardImpl { public AleshaWhoSmilesAtDeath(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Human"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AleshasVanguard.java b/Mage.Sets/src/mage/cards/a/AleshasVanguard.java index b6f776dd74c..c708aac616f 100644 --- a/Mage.Sets/src/mage/cards/a/AleshasVanguard.java +++ b/Mage.Sets/src/mage/cards/a/AleshasVanguard.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.DashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,8 +44,8 @@ public class AleshasVanguard extends CardImpl { public AleshasVanguard(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}"); - this.subtype.add("Orc"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.ORC); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AlexiZephyrMage.java b/Mage.Sets/src/mage/cards/a/AlexiZephyrMage.java index c5d9ca90e4b..c83adbb4014 100644 --- a/Mage.Sets/src/mage/cards/a/AlexiZephyrMage.java +++ b/Mage.Sets/src/mage/cards/a/AlexiZephyrMage.java @@ -37,6 +37,7 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.FilterCard; @@ -65,8 +66,8 @@ public class AlexiZephyrMage extends CardImpl { public AlexiZephyrMage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{U}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Human"); - this.subtype.add("Spellshaper"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SPELLSHAPER); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AlexisCloak.java b/Mage.Sets/src/mage/cards/a/AlexisCloak.java index 332d872f39f..d7489d91441 100644 --- a/Mage.Sets/src/mage/cards/a/AlexisCloak.java +++ b/Mage.Sets/src/mage/cards/a/AlexisCloak.java @@ -36,10 +36,7 @@ import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -53,7 +50,7 @@ public class AlexisCloak extends CardImpl { public AlexisCloak(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Flash this.addAbility(FlashAbility.getInstance()); diff --git a/Mage.Sets/src/mage/cards/a/AlgaeGharial.java b/Mage.Sets/src/mage/cards/a/AlgaeGharial.java index 5e28ae851e9..14ff78e6a62 100644 --- a/Mage.Sets/src/mage/cards/a/AlgaeGharial.java +++ b/Mage.Sets/src/mage/cards/a/AlgaeGharial.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.counters.CounterType; import java.util.UUID; @@ -46,7 +47,7 @@ public class AlgaeGharial extends CardImpl { public AlgaeGharial(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); - this.subtype.add("Crocodile"); + this.subtype.add(SubType.CROCODILE); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AlhammarretHighArbiter.java b/Mage.Sets/src/mage/cards/a/AlhammarretHighArbiter.java index eae24180270..8d858ab8992 100644 --- a/Mage.Sets/src/mage/cards/a/AlhammarretHighArbiter.java +++ b/Mage.Sets/src/mage/cards/a/AlhammarretHighArbiter.java @@ -59,7 +59,7 @@ public class AlhammarretHighArbiter extends CardImpl { public AlhammarretHighArbiter(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{U}{U}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Sphinx"); + this.subtype.add(SubType.SPHINX); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AliBaba.java b/Mage.Sets/src/mage/cards/a/AliBaba.java index e2deda92e15..7f166cd4b40 100644 --- a/Mage.Sets/src/mage/cards/a/AliBaba.java +++ b/Mage.Sets/src/mage/cards/a/AliBaba.java @@ -57,8 +57,8 @@ public class AliBaba extends CardImpl { public AliBaba(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}"); - this.subtype.add("Human"); - this.subtype.add("Rogue"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.ROGUE); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AliFromCairo.java b/Mage.Sets/src/mage/cards/a/AliFromCairo.java index e58ea12904b..0ade9290d57 100644 --- a/Mage.Sets/src/mage/cards/a/AliFromCairo.java +++ b/Mage.Sets/src/mage/cards/a/AliFromCairo.java @@ -33,10 +33,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; 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.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; @@ -52,7 +49,7 @@ public class AliFromCairo extends CardImpl { public AliFromCairo(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); - this.subtype.add("Human"); + this.subtype.add(SubType.HUMAN); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AllIsDust.java b/Mage.Sets/src/mage/cards/a/AllIsDust.java index e456796abfd..d3dbba9ed8b 100644 --- a/Mage.Sets/src/mage/cards/a/AllIsDust.java +++ b/Mage.Sets/src/mage/cards/a/AllIsDust.java @@ -33,6 +33,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.game.Game; import mage.game.permanent.Permanent; @@ -46,7 +47,7 @@ public class AllIsDust extends CardImpl { public AllIsDust(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.SORCERY},"{7}"); - this.subtype.add("Eldrazi"); + this.subtype.add(SubType.ELDRAZI); this.getSpellAbility().addEffect(new AllIsDustEffect()); } diff --git a/Mage.Sets/src/mage/cards/a/AlleyGrifters.java b/Mage.Sets/src/mage/cards/a/AlleyGrifters.java index cace05e799d..8e5cd6f2555 100644 --- a/Mage.Sets/src/mage/cards/a/AlleyGrifters.java +++ b/Mage.Sets/src/mage/cards/a/AlleyGrifters.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -49,8 +50,8 @@ public class AlleyGrifters extends CardImpl { public AlleyGrifters(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{B}"); - this.subtype.add("Human"); - this.subtype.add("Mercenary"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.MERCENARY); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AlleyStrangler.java b/Mage.Sets/src/mage/cards/a/AlleyStrangler.java index fcc6105d1b3..0b446ba623f 100644 --- a/Mage.Sets/src/mage/cards/a/AlleyStrangler.java +++ b/Mage.Sets/src/mage/cards/a/AlleyStrangler.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.MenaceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,8 +45,8 @@ public class AlleyStrangler extends CardImpl { public AlleyStrangler(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}"); - this.subtype.add("Aetherborn"); - this.subtype.add("Rogue"); + this.subtype.add(SubType.AETHERBORN); + this.subtype.add(SubType.ROGUE); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AllosaurusRider.java b/Mage.Sets/src/mage/cards/a/AllosaurusRider.java index 2d417bce3e5..8b2b6d6ef7f 100644 --- a/Mage.Sets/src/mage/cards/a/AllosaurusRider.java +++ b/Mage.Sets/src/mage/cards/a/AllosaurusRider.java @@ -40,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledLandPermanent; @@ -62,8 +63,8 @@ public class AllosaurusRider extends CardImpl { public AllosaurusRider(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{G}{G}"); - this.subtype.add("Elf"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.ELF); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/a/AlloyGolem.java b/Mage.Sets/src/mage/cards/a/AlloyGolem.java index cdf90fad7a5..2da40e218c4 100644 --- a/Mage.Sets/src/mage/cards/a/AlloyGolem.java +++ b/Mage.Sets/src/mage/cards/a/AlloyGolem.java @@ -34,6 +34,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import java.util.UUID; @@ -46,7 +47,7 @@ public class AlloyGolem extends CardImpl { public AlloyGolem(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{6}"); - this.subtype.add("Golem"); + this.subtype.add(SubType.GOLEM); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AlloyMyr.java b/Mage.Sets/src/mage/cards/a/AlloyMyr.java index 8814502a493..6ec08253063 100644 --- a/Mage.Sets/src/mage/cards/a/AlloyMyr.java +++ b/Mage.Sets/src/mage/cards/a/AlloyMyr.java @@ -32,6 +32,7 @@ import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,7 +44,7 @@ public class AlloyMyr extends CardImpl { public AlloyMyr(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{3}"); - this.subtype.add("Myr"); + this.subtype.add(SubType.MYR); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AlluringSiren.java b/Mage.Sets/src/mage/cards/a/AlluringSiren.java index b8c3bf9b14e..30db83f59c7 100644 --- a/Mage.Sets/src/mage/cards/a/AlluringSiren.java +++ b/Mage.Sets/src/mage/cards/a/AlluringSiren.java @@ -35,10 +35,7 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.combat.AttacksIfAbleTargetEffect; 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.permanent.ControllerPredicate; import mage.target.common.TargetCreaturePermanent; @@ -60,7 +57,7 @@ public class AlluringSiren extends CardImpl { public AlluringSiren(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); - this.subtype.add("Siren"); + this.subtype.add(SubType.SIREN); this.power = new MageInt(1); this.toughness = new MageInt(1); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttacksIfAbleTargetEffect(Duration.EndOfTurn), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/a/AlmsBeast.java b/Mage.Sets/src/mage/cards/a/AlmsBeast.java index dc667a562c7..1bcc98349ed 100644 --- a/Mage.Sets/src/mage/cards/a/AlmsBeast.java +++ b/Mage.Sets/src/mage/cards/a/AlmsBeast.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -51,7 +52,7 @@ public class AlmsBeast extends CardImpl { public AlmsBeast(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{B}"); - this.subtype.add("Beast"); + this.subtype.add(SubType.BEAST); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/AlphaAuthority.java b/Mage.Sets/src/mage/cards/a/AlphaAuthority.java index 0a83bd64c32..95b23fecf8a 100644 --- a/Mage.Sets/src/mage/cards/a/AlphaAuthority.java +++ b/Mage.Sets/src/mage/cards/a/AlphaAuthority.java @@ -54,7 +54,7 @@ public class AlphaAuthority extends CardImpl { public AlphaAuthority(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/cards/a/AlphaKavu.java b/Mage.Sets/src/mage/cards/a/AlphaKavu.java index 21328e62ab8..da5e5622e12 100644 --- a/Mage.Sets/src/mage/cards/a/AlphaKavu.java +++ b/Mage.Sets/src/mage/cards/a/AlphaKavu.java @@ -58,7 +58,7 @@ public class AlphaKavu extends CardImpl { public AlphaKavu(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); - this.subtype.add("Kavu"); + this.subtype.add(SubType.KAVU); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AlphaMyr.java b/Mage.Sets/src/mage/cards/a/AlphaMyr.java index 86d9aa080f9..e2e951b5c1a 100644 --- a/Mage.Sets/src/mage/cards/a/AlphaMyr.java +++ b/Mage.Sets/src/mage/cards/a/AlphaMyr.java @@ -31,6 +31,7 @@ import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -42,7 +43,7 @@ public class AlphaMyr extends CardImpl { public AlphaMyr(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{2}"); - this.subtype.add("Myr"); + this.subtype.add(SubType.MYR); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AlphaStatus.java b/Mage.Sets/src/mage/cards/a/AlphaStatus.java index 673ca8768cb..8ac4c29bc4f 100644 --- a/Mage.Sets/src/mage/cards/a/AlphaStatus.java +++ b/Mage.Sets/src/mage/cards/a/AlphaStatus.java @@ -36,10 +36,7 @@ import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -56,7 +53,7 @@ public class AlphaStatus extends CardImpl { public AlphaStatus(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/cards/a/AlphaTyrranax.java b/Mage.Sets/src/mage/cards/a/AlphaTyrranax.java index d0dbc294de0..e312dbf5392 100644 --- a/Mage.Sets/src/mage/cards/a/AlphaTyrranax.java +++ b/Mage.Sets/src/mage/cards/a/AlphaTyrranax.java @@ -32,6 +32,7 @@ import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,7 +44,7 @@ public class AlphaTyrranax extends CardImpl { public AlphaTyrranax (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{G}"); - this.subtype.add("Beast"); + this.subtype.add(SubType.BEAST); this.power = new MageInt(6); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AlpineGrizzly.java b/Mage.Sets/src/mage/cards/a/AlpineGrizzly.java index 59ac904f089..fd1e95e197f 100644 --- a/Mage.Sets/src/mage/cards/a/AlpineGrizzly.java +++ b/Mage.Sets/src/mage/cards/a/AlpineGrizzly.java @@ -31,6 +31,7 @@ import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -42,7 +43,7 @@ public class AlpineGrizzly extends CardImpl { public AlpineGrizzly(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); - this.subtype.add("Bear"); + this.subtype.add(SubType.BEAR); this.power = new MageInt(4); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AltacBloodseeker.java b/Mage.Sets/src/mage/cards/a/AltacBloodseeker.java index a64e1cc5d88..ec4878d348f 100644 --- a/Mage.Sets/src/mage/cards/a/AltacBloodseeker.java +++ b/Mage.Sets/src/mage/cards/a/AltacBloodseeker.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -59,8 +60,8 @@ public class AltacBloodseeker extends CardImpl { public AltacBloodseeker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}"); - this.subtype.add("Human"); - this.subtype.add("Berserker"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.BERSERKER); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AltarGolem.java b/Mage.Sets/src/mage/cards/a/AltarGolem.java index 615be6a9532..b014389cc55 100644 --- a/Mage.Sets/src/mage/cards/a/AltarGolem.java +++ b/Mage.Sets/src/mage/cards/a/AltarGolem.java @@ -41,6 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; @@ -65,7 +66,7 @@ public class AltarGolem extends CardImpl { public AltarGolem(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{7}"); - this.subtype.add("Golem"); + this.subtype.add(SubType.GOLEM); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/a/AlteredEgo.java b/Mage.Sets/src/mage/cards/a/AlteredEgo.java index c55f31d1b8b..ace711f08c2 100644 --- a/Mage.Sets/src/mage/cards/a/AlteredEgo.java +++ b/Mage.Sets/src/mage/cards/a/AlteredEgo.java @@ -37,6 +37,7 @@ import mage.abilities.effects.common.EntersBattlefieldWithXCountersEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.counters.Counter; import mage.counters.CounterType; import mage.filter.StaticFilters; @@ -53,7 +54,7 @@ public class AlteredEgo extends CardImpl { public AlteredEgo(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{X}{2}{G}{U}"); - this.subtype.add("Shapeshifter"); + this.subtype.add(SubType.SHAPESHIFTER); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/a/AmbassadorLaquatus.java b/Mage.Sets/src/mage/cards/a/AmbassadorLaquatus.java index 8930983a452..fd03b28f8da 100644 --- a/Mage.Sets/src/mage/cards/a/AmbassadorLaquatus.java +++ b/Mage.Sets/src/mage/cards/a/AmbassadorLaquatus.java @@ -35,6 +35,7 @@ import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.target.TargetPlayer; @@ -50,8 +51,8 @@ public class AmbassadorLaquatus extends CardImpl { public AmbassadorLaquatus(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{U}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Merfolk"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.MERFOLK); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AmbassadorOak.java b/Mage.Sets/src/mage/cards/a/AmbassadorOak.java index 85a453e1d00..e8a0600f57e 100644 --- a/Mage.Sets/src/mage/cards/a/AmbassadorOak.java +++ b/Mage.Sets/src/mage/cards/a/AmbassadorOak.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.game.permanent.token.ElfToken; import java.util.UUID; @@ -45,8 +46,8 @@ public class AmbassadorOak extends CardImpl { public AmbassadorOak(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); - this.subtype.add("Treefolk"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.TREEFOLK); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AmbitiousAetherborn.java b/Mage.Sets/src/mage/cards/a/AmbitiousAetherborn.java index 522c09014f1..346e417a787 100644 --- a/Mage.Sets/src/mage/cards/a/AmbitiousAetherborn.java +++ b/Mage.Sets/src/mage/cards/a/AmbitiousAetherborn.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.FabricateAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,8 +44,8 @@ public class AmbitiousAetherborn extends CardImpl { public AmbitiousAetherborn(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}"); - this.subtype.add("Aetherborn"); - this.subtype.add("Artificer"); + this.subtype.add(SubType.AETHERBORN); + this.subtype.add(SubType.ARTIFICER); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AmbuscadeShaman.java b/Mage.Sets/src/mage/cards/a/AmbuscadeShaman.java index c07289236a5..64c6cfc3e7f 100644 --- a/Mage.Sets/src/mage/cards/a/AmbuscadeShaman.java +++ b/Mage.Sets/src/mage/cards/a/AmbuscadeShaman.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -52,8 +53,8 @@ public class AmbuscadeShaman extends CardImpl { public AmbuscadeShaman(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}"); - this.subtype.add("Orc"); - this.subtype.add("Shaman"); + this.subtype.add(SubType.ORC); + this.subtype.add(SubType.SHAMAN); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AmbushCommander.java b/Mage.Sets/src/mage/cards/a/AmbushCommander.java index 70cf5fbd853..41a28ea6cc5 100644 --- a/Mage.Sets/src/mage/cards/a/AmbushCommander.java +++ b/Mage.Sets/src/mage/cards/a/AmbushCommander.java @@ -63,7 +63,7 @@ public class AmbushCommander extends CardImpl { public AmbushCommander(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}"); - this.subtype.add("Elf"); + this.subtype.add(SubType.ELF); this.power = new MageInt(2); this.toughness = new MageInt(2); @@ -94,7 +94,7 @@ class AmbushCommanderToken extends Token { public AmbushCommanderToken() { super("Elf", "1/1 green Elf creatures"); - subtype.add("Elf"); + subtype.add(SubType.ELF); cardType.add(CardType.CREATURE); power = new MageInt(1); toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AmbushKrotiq.java b/Mage.Sets/src/mage/cards/a/AmbushKrotiq.java index b2e835835e6..db1eb56c783 100644 --- a/Mage.Sets/src/mage/cards/a/AmbushKrotiq.java +++ b/Mage.Sets/src/mage/cards/a/AmbushKrotiq.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; @@ -53,7 +54,7 @@ public class AmbushKrotiq extends CardImpl { public AmbushKrotiq(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{G}"); - this.subtype.add("Insect"); + this.subtype.add(SubType.INSECT); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AmbushParty.java b/Mage.Sets/src/mage/cards/a/AmbushParty.java index 41fde1137be..3cf59403252 100644 --- a/Mage.Sets/src/mage/cards/a/AmbushParty.java +++ b/Mage.Sets/src/mage/cards/a/AmbushParty.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,8 +45,8 @@ public class AmbushParty extends CardImpl { public AmbushParty(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}"); - this.subtype.add("Human"); - this.subtype.add("Rogue"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.ROGUE); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AmbushViper.java b/Mage.Sets/src/mage/cards/a/AmbushViper.java index 4423e962639..4a6b6e4618c 100644 --- a/Mage.Sets/src/mage/cards/a/AmbushViper.java +++ b/Mage.Sets/src/mage/cards/a/AmbushViper.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,7 +45,7 @@ public class AmbushViper extends CardImpl { public AmbushViper(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); - this.subtype.add("Snake"); + this.subtype.add(SubType.SNAKE); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AmmitEternal.java b/Mage.Sets/src/mage/cards/a/AmmitEternal.java index 16d1b5278ad..410e567a52c 100644 --- a/Mage.Sets/src/mage/cards/a/AmmitEternal.java +++ b/Mage.Sets/src/mage/cards/a/AmmitEternal.java @@ -1,6 +1,5 @@ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.common.SpellCastOpponentTriggeredAbility; @@ -10,15 +9,18 @@ import mage.abilities.keyword.AfflictAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.counters.CounterType; +import java.util.UUID; + public class AmmitEternal extends CardImpl { public AmmitEternal(UUID ownerId, CardSetInfo cardSetInfo) { super(ownerId, cardSetInfo, new CardType[]{CardType.CREATURE}, "{2}{B}"); - subtype.add("Zombie"); - subtype.add("Crocodile"); - subtype.add("Demon"); + subtype.add(SubType.ZOMBIE); + subtype.add(SubType.CROCODILE); + subtype.add(SubType.DEMON); power = new MageInt(5); toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AmoeboidChangeling.java b/Mage.Sets/src/mage/cards/a/AmoeboidChangeling.java index a8d75ee5be4..f7e2bd99e5e 100644 --- a/Mage.Sets/src/mage/cards/a/AmoeboidChangeling.java +++ b/Mage.Sets/src/mage/cards/a/AmoeboidChangeling.java @@ -49,7 +49,7 @@ public class AmoeboidChangeling extends CardImpl { public AmoeboidChangeling(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); - this.subtype.add("Shapeshifter"); + this.subtype.add(SubType.SHAPESHIFTER); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AmphinCutthroat.java b/Mage.Sets/src/mage/cards/a/AmphinCutthroat.java index feea63dd51a..13a68d29780 100644 --- a/Mage.Sets/src/mage/cards/a/AmphinCutthroat.java +++ b/Mage.Sets/src/mage/cards/a/AmphinCutthroat.java @@ -31,6 +31,7 @@ import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -42,8 +43,8 @@ public class AmphinCutthroat extends CardImpl { public AmphinCutthroat(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}"); - this.subtype.add("Salamander"); - this.subtype.add("Rogue"); + this.subtype.add(SubType.SALAMANDER); + this.subtype.add(SubType.ROGUE); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AmphinPathmage.java b/Mage.Sets/src/mage/cards/a/AmphinPathmage.java index 63662aa26b2..b8269c73281 100644 --- a/Mage.Sets/src/mage/cards/a/AmphinPathmage.java +++ b/Mage.Sets/src/mage/cards/a/AmphinPathmage.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; @@ -49,8 +50,8 @@ public class AmphinPathmage extends CardImpl { public AmphinPathmage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}"); - this.subtype.add("Salamander"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.SALAMANDER); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AmprynTactician.java b/Mage.Sets/src/mage/cards/a/AmprynTactician.java index b0be9ef3550..279561d8f24 100644 --- a/Mage.Sets/src/mage/cards/a/AmprynTactician.java +++ b/Mage.Sets/src/mage/cards/a/AmprynTactician.java @@ -34,6 +34,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import java.util.UUID; @@ -45,8 +46,8 @@ public class AmprynTactician extends CardImpl { public AmprynTactician(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AmrouKithkin.java b/Mage.Sets/src/mage/cards/a/AmrouKithkin.java index 4aed558c559..403a1adae11 100644 --- a/Mage.Sets/src/mage/cards/a/AmrouKithkin.java +++ b/Mage.Sets/src/mage/cards/a/AmrouKithkin.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; @@ -54,7 +55,7 @@ public class AmrouKithkin extends CardImpl { public AmrouKithkin(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}"); - this.subtype.add("Kithkin"); + this.subtype.add(SubType.KITHKIN); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AmrouScout.java b/Mage.Sets/src/mage/cards/a/AmrouScout.java index 11f43fc98b6..2166c5d120c 100644 --- a/Mage.Sets/src/mage/cards/a/AmrouScout.java +++ b/Mage.Sets/src/mage/cards/a/AmrouScout.java @@ -59,9 +59,9 @@ public class AmrouScout extends CardImpl { public AmrouScout(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Kithkin"); - this.subtype.add("Rebel"); - this.subtype.add("Scout"); + this.subtype.add(SubType.KITHKIN); + this.subtype.add(SubType.REBEL); + this.subtype.add(SubType.SCOUT); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AmrouSeekers.java b/Mage.Sets/src/mage/cards/a/AmrouSeekers.java index ccc0782c064..689e5d5c576 100644 --- a/Mage.Sets/src/mage/cards/a/AmrouSeekers.java +++ b/Mage.Sets/src/mage/cards/a/AmrouSeekers.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -61,8 +62,8 @@ public class AmrouSeekers extends CardImpl { public AmrouSeekers(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.subtype.add("Kithkin"); - this.subtype.add("Rebel"); + this.subtype.add(SubType.KITHKIN); + this.subtype.add(SubType.REBEL); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/Amugaba.java b/Mage.Sets/src/mage/cards/a/Amugaba.java index 7a4b135b848..8f2a5e60bb7 100644 --- a/Mage.Sets/src/mage/cards/a/Amugaba.java +++ b/Mage.Sets/src/mage/cards/a/Amugaba.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetCardInHand; @@ -50,7 +51,7 @@ public class Amugaba extends CardImpl { public Amugaba(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{U}{U}"); - this.subtype.add("Illusion"); + this.subtype.add(SubType.ILLUSION); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/AnHavvaConstable.java b/Mage.Sets/src/mage/cards/a/AnHavvaConstable.java index 7b4f6151f0f..e4a04cb9eb8 100644 --- a/Mage.Sets/src/mage/cards/a/AnHavvaConstable.java +++ b/Mage.Sets/src/mage/cards/a/AnHavvaConstable.java @@ -51,7 +51,7 @@ public class AnHavvaConstable extends CardImpl { public AnHavvaConstable(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}{G}"); - this.subtype.add("Human"); + this.subtype.add(SubType.HUMAN); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AnaBattlemage.java b/Mage.Sets/src/mage/cards/a/AnaBattlemage.java index 1052a275103..32623a87afd 100644 --- a/Mage.Sets/src/mage/cards/a/AnaBattlemage.java +++ b/Mage.Sets/src/mage/cards/a/AnaBattlemage.java @@ -40,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.permanent.TappedPredicate; @@ -65,8 +66,8 @@ public class AnaBattlemage extends CardImpl { public AnaBattlemage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AnaDisciple.java b/Mage.Sets/src/mage/cards/a/AnaDisciple.java index 3d6fb5b268e..4f90869c2c4 100644 --- a/Mage.Sets/src/mage/cards/a/AnaDisciple.java +++ b/Mage.Sets/src/mage/cards/a/AnaDisciple.java @@ -38,10 +38,7 @@ import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Duration; -import mage.constants.Zone; +import mage.constants.*; import mage.target.common.TargetCreaturePermanent; import java.util.UUID; @@ -53,8 +50,8 @@ public class AnaDisciple extends CardImpl { public AnaDisciple(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AnabaAncestor.java b/Mage.Sets/src/mage/cards/a/AnabaAncestor.java index 24b6954688f..7fe36681db7 100644 --- a/Mage.Sets/src/mage/cards/a/AnabaAncestor.java +++ b/Mage.Sets/src/mage/cards/a/AnabaAncestor.java @@ -60,8 +60,8 @@ public class AnabaAncestor extends CardImpl { public AnabaAncestor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}"); - this.subtype.add("Minotaur"); - this.subtype.add("Spirit"); + this.subtype.add(SubType.MINOTAUR); + this.subtype.add(SubType.SPIRIT); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AnabaBodyguard.java b/Mage.Sets/src/mage/cards/a/AnabaBodyguard.java index fb78c171057..f330f23e8a0 100644 --- a/Mage.Sets/src/mage/cards/a/AnabaBodyguard.java +++ b/Mage.Sets/src/mage/cards/a/AnabaBodyguard.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,7 +44,7 @@ public class AnabaBodyguard extends CardImpl { public AnabaBodyguard(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); - this.subtype.add("Minotaur"); + this.subtype.add(SubType.MINOTAUR); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AnabaShaman.java b/Mage.Sets/src/mage/cards/a/AnabaShaman.java index bcf05c418e4..2eb7b8ecdf8 100644 --- a/Mage.Sets/src/mage/cards/a/AnabaShaman.java +++ b/Mage.Sets/src/mage/cards/a/AnabaShaman.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; @@ -49,8 +50,8 @@ public class AnabaShaman extends CardImpl { public AnabaShaman(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); - this.subtype.add("Minotaur"); - this.subtype.add("Shaman"); + this.subtype.add(SubType.MINOTAUR); + this.subtype.add(SubType.SHAMAN); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AnabaSpiritCrafter.java b/Mage.Sets/src/mage/cards/a/AnabaSpiritCrafter.java index 453ddd254c1..9fb0bb1691f 100644 --- a/Mage.Sets/src/mage/cards/a/AnabaSpiritCrafter.java +++ b/Mage.Sets/src/mage/cards/a/AnabaSpiritCrafter.java @@ -55,8 +55,8 @@ public class AnabaSpiritCrafter extends CardImpl { public AnabaSpiritCrafter(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); - this.subtype.add("Minotaur"); - this.subtype.add("Shaman"); + this.subtype.add(SubType.MINOTAUR); + this.subtype.add(SubType.SHAMAN); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/Anaconda.java b/Mage.Sets/src/mage/cards/a/Anaconda.java index e9dfd099490..e52847f37d6 100644 --- a/Mage.Sets/src/mage/cards/a/Anaconda.java +++ b/Mage.Sets/src/mage/cards/a/Anaconda.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,7 +45,7 @@ public class Anaconda extends CardImpl { public Anaconda (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); - this.subtype.add("Snake"); + this.subtype.add(SubType.SNAKE); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AnafenzaKinTreeSpirit.java b/Mage.Sets/src/mage/cards/a/AnafenzaKinTreeSpirit.java index 8e1f85e5127..6eea3d058c5 100644 --- a/Mage.Sets/src/mage/cards/a/AnafenzaKinTreeSpirit.java +++ b/Mage.Sets/src/mage/cards/a/AnafenzaKinTreeSpirit.java @@ -33,6 +33,7 @@ import mage.abilities.effects.keyword.BolsterEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; @@ -58,8 +59,8 @@ public class AnafenzaKinTreeSpirit extends CardImpl { public AnafenzaKinTreeSpirit(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Spirit"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.SPIRIT); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java b/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java index 8af34fb2443..b3d397ee90a 100644 --- a/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java +++ b/Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java @@ -66,8 +66,8 @@ public class AnafenzaTheForemost extends CardImpl { public AnafenzaTheForemost(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{B}{G}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AnakinSkywalker.java b/Mage.Sets/src/mage/cards/a/AnakinSkywalker.java index 3cc77e187f2..c9961d94dc2 100644 --- a/Mage.Sets/src/mage/cards/a/AnakinSkywalker.java +++ b/Mage.Sets/src/mage/cards/a/AnakinSkywalker.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateAsSorceryActivatedAbility; @@ -52,6 +51,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Styxo @@ -61,8 +62,8 @@ public class AnakinSkywalker extends CardImpl { public AnakinSkywalker(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}{B}{R}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Human"); - this.subtype.add("Sith"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SITH); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/Anarchist.java b/Mage.Sets/src/mage/cards/a/Anarchist.java index e6c79933222..99214e0dbc0 100644 --- a/Mage.Sets/src/mage/cards/a/Anarchist.java +++ b/Mage.Sets/src/mage/cards/a/Anarchist.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCardInYourGraveyard; @@ -53,8 +54,8 @@ public class Anarchist extends CardImpl { public Anarchist(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/Anathemancer.java b/Mage.Sets/src/mage/cards/a/Anathemancer.java index fcf3cee153d..a5a6fb5bf93 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.SubType; import mage.constants.SuperType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; @@ -56,8 +57,8 @@ public class Anathemancer extends CardImpl { public Anathemancer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{R}"); - this.subtype.add("Zombie"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.ZOMBIE); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/Anavolver.java b/Mage.Sets/src/mage/cards/a/Anavolver.java index 6d830c6d479..318d4487901 100644 --- a/Mage.Sets/src/mage/cards/a/Anavolver.java +++ b/Mage.Sets/src/mage/cards/a/Anavolver.java @@ -43,6 +43,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; @@ -55,7 +56,7 @@ public class Anavolver extends CardImpl { public Anavolver(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); - this.subtype.add("Volver"); + this.subtype.add(SubType.VOLVER); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AnaxAndCymede.java b/Mage.Sets/src/mage/cards/a/AnaxAndCymede.java index 57ca70914d0..99784196923 100644 --- a/Mage.Sets/src/mage/cards/a/AnaxAndCymede.java +++ b/Mage.Sets/src/mage/cards/a/AnaxAndCymede.java @@ -40,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; @@ -56,8 +57,8 @@ public class AnaxAndCymede extends CardImpl { public AnaxAndCymede(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{W}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AncestorsChosen.java b/Mage.Sets/src/mage/cards/a/AncestorsChosen.java index e84ef24c418..0631430467a 100644 --- a/Mage.Sets/src/mage/cards/a/AncestorsChosen.java +++ b/Mage.Sets/src/mage/cards/a/AncestorsChosen.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -46,8 +47,8 @@ public class AncestorsChosen extends CardImpl { public AncestorsChosen(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}{W}"); - this.subtype.add("Human"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AncestorsProphet.java b/Mage.Sets/src/mage/cards/a/AncestorsProphet.java index 14bd1186cd0..0a5dea429b1 100644 --- a/Mage.Sets/src/mage/cards/a/AncestorsProphet.java +++ b/Mage.Sets/src/mage/cards/a/AncestorsProphet.java @@ -59,8 +59,8 @@ public class AncestorsProphet extends CardImpl { public AncestorsProphet(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}"); - this.subtype.add("Human"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(1); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AncestralMask.java b/Mage.Sets/src/mage/cards/a/AncestralMask.java index b03b8a674f7..90717137290 100644 --- a/Mage.Sets/src/mage/cards/a/AncestralMask.java +++ b/Mage.Sets/src/mage/cards/a/AncestralMask.java @@ -34,10 +34,7 @@ import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.TargetPermanent; @@ -59,7 +56,7 @@ public class AncestralMask extends CardImpl { public AncestralMask(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{G}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/cards/a/AncestralStatue.java b/Mage.Sets/src/mage/cards/a/AncestralStatue.java index d0baef62de4..e2f0496fd00 100644 --- a/Mage.Sets/src/mage/cards/a/AncestralStatue.java +++ b/Mage.Sets/src/mage/cards/a/AncestralStatue.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.ReturnToHandChosenControlledPermanentEffect import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -53,7 +54,7 @@ public class AncestralStatue extends CardImpl { public AncestralStatue(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{4}"); - this.subtype.add("Golem"); + this.subtype.add(SubType.GOLEM); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AncestralVengeance.java b/Mage.Sets/src/mage/cards/a/AncestralVengeance.java index 9ed2d3962e4..f503a931c5f 100644 --- a/Mage.Sets/src/mage/cards/a/AncestralVengeance.java +++ b/Mage.Sets/src/mage/cards/a/AncestralVengeance.java @@ -36,10 +36,7 @@ import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.EnchantAbility; 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.counters.CounterType; import mage.target.TargetPermanent; import mage.target.common.TargetControlledCreaturePermanent; @@ -55,7 +52,7 @@ public class AncestralVengeance extends CardImpl { public AncestralVengeance(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{B}{B}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/cards/a/AncientCarp.java b/Mage.Sets/src/mage/cards/a/AncientCarp.java index 0f571249f65..6adf4d98957 100644 --- a/Mage.Sets/src/mage/cards/a/AncientCarp.java +++ b/Mage.Sets/src/mage/cards/a/AncientCarp.java @@ -31,6 +31,7 @@ import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -42,7 +43,7 @@ public class AncientCarp extends CardImpl { public AncientCarp(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}"); - this.subtype.add("Fish"); + this.subtype.add(SubType.FISH); this.power = new MageInt(2); this.toughness = new MageInt(5); } diff --git a/Mage.Sets/src/mage/cards/a/AncientCrab.java b/Mage.Sets/src/mage/cards/a/AncientCrab.java index 232bda2aabf..ef33d2629bf 100644 --- a/Mage.Sets/src/mage/cards/a/AncientCrab.java +++ b/Mage.Sets/src/mage/cards/a/AncientCrab.java @@ -31,6 +31,7 @@ import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -42,7 +43,7 @@ public class AncientCrab extends CardImpl { public AncientCrab(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{U}"); - this.subtype.add("Crab"); + this.subtype.add(SubType.CRAB); this.power = new MageInt(1); this.toughness = new MageInt(5); } diff --git a/Mage.Sets/src/mage/cards/a/AncientHellkite.java b/Mage.Sets/src/mage/cards/a/AncientHellkite.java index c19414f28a1..23a82801d5e 100644 --- a/Mage.Sets/src/mage/cards/a/AncientHellkite.java +++ b/Mage.Sets/src/mage/cards/a/AncientHellkite.java @@ -40,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ColoredManaSymbol; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; @@ -57,7 +58,7 @@ public class AncientHellkite extends CardImpl { public AncientHellkite(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}{R}{R}"); - this.subtype.add("Dragon"); + this.subtype.add(SubType.DRAGON); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/AncientHydra.java b/Mage.Sets/src/mage/cards/a/AncientHydra.java index b0a2bb759f9..a96d7087729 100644 --- a/Mage.Sets/src/mage/cards/a/AncientHydra.java +++ b/Mage.Sets/src/mage/cards/a/AncientHydra.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.FadingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreatureOrPlayer; @@ -51,7 +52,7 @@ public class AncientHydra extends CardImpl { public AncientHydra(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}"); - this.subtype.add("Hydra"); + this.subtype.add(SubType.HYDRA); this.power = new MageInt(5); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AncientKavu.java b/Mage.Sets/src/mage/cards/a/AncientKavu.java index 7b4bd19e6bd..4f0ba57bc58 100644 --- a/Mage.Sets/src/mage/cards/a/AncientKavu.java +++ b/Mage.Sets/src/mage/cards/a/AncientKavu.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -48,7 +49,7 @@ public class AncientKavu extends CardImpl { public AncientKavu(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); - this.subtype.add("Kavu"); + this.subtype.add(SubType.KAVU); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AncientOfTheEquinox.java b/Mage.Sets/src/mage/cards/a/AncientOfTheEquinox.java index 09e3e695ff3..a1c7cf5dec0 100644 --- a/Mage.Sets/src/mage/cards/a/AncientOfTheEquinox.java +++ b/Mage.Sets/src/mage/cards/a/AncientOfTheEquinox.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,7 +45,7 @@ public class AncientOfTheEquinox extends CardImpl { public AncientOfTheEquinox(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},""); - this.subtype.add("Treefolk"); + this.subtype.add(SubType.TREEFOLK); this.power = new MageInt(4); this.toughness = new MageInt(4); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/cards/a/AncientOoze.java b/Mage.Sets/src/mage/cards/a/AncientOoze.java index 574394a2899..680fab976cc 100644 --- a/Mage.Sets/src/mage/cards/a/AncientOoze.java +++ b/Mage.Sets/src/mage/cards/a/AncientOoze.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; @@ -53,7 +54,7 @@ public class AncientOoze extends CardImpl { public AncientOoze(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{G}{G}"); - this.subtype.add("Ooze"); + this.subtype.add(SubType.OOZE); this.color.setGreen(true); this.power = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/a/AncientSilverback.java b/Mage.Sets/src/mage/cards/a/AncientSilverback.java index bad154d04c3..42e0b71dffc 100644 --- a/Mage.Sets/src/mage/cards/a/AncientSilverback.java +++ b/Mage.Sets/src/mage/cards/a/AncientSilverback.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -46,7 +47,7 @@ public class AncientSilverback extends CardImpl { public AncientSilverback(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{G}"); - this.subtype.add("Ape"); + this.subtype.add(SubType.APE); this.power = new MageInt(6); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AncientSpider.java b/Mage.Sets/src/mage/cards/a/AncientSpider.java index 6d5c7040555..f3ff5090b8f 100644 --- a/Mage.Sets/src/mage/cards/a/AncientSpider.java +++ b/Mage.Sets/src/mage/cards/a/AncientSpider.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,7 +46,7 @@ public class AncientSpider extends CardImpl { public AncientSpider(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{W}"); - this.subtype.add("Spider"); + this.subtype.add(SubType.SPIDER); this.power = new MageInt(2); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AndraditeLeech.java b/Mage.Sets/src/mage/cards/a/AndraditeLeech.java index 4daa66ee6e3..8b065cb4397 100644 --- a/Mage.Sets/src/mage/cards/a/AndraditeLeech.java +++ b/Mage.Sets/src/mage/cards/a/AndraditeLeech.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; @@ -58,7 +59,7 @@ public class AndraditeLeech extends CardImpl { public AndraditeLeech(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}"); - this.subtype.add("Leech"); + this.subtype.add(SubType.LEECH); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AngelOfCondemnation.java b/Mage.Sets/src/mage/cards/a/AngelOfCondemnation.java index a67565ec121..549c2c0c5cf 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfCondemnation.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfCondemnation.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -47,6 +46,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; @@ -56,6 +56,8 @@ import mage.players.Player; import mage.target.common.TargetCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author emerald000 @@ -70,7 +72,7 @@ public class AngelOfCondemnation extends CardImpl { public AngelOfCondemnation(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AngelOfDeliverance.java b/Mage.Sets/src/mage/cards/a/AngelOfDeliverance.java index a9381c7c9ad..5fef8afbde2 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfDeliverance.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfDeliverance.java @@ -38,6 +38,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; @@ -63,7 +64,7 @@ public class AngelOfDeliverance extends CardImpl { public AngelOfDeliverance(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{6}{W}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/AngelOfDespair.java b/Mage.Sets/src/mage/cards/a/AngelOfDespair.java index 87f08f49eb6..827250e0458 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfDespair.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfDespair.java @@ -36,6 +36,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.target.TargetPermanent; import java.util.UUID; @@ -48,7 +49,7 @@ public class AngelOfDespair extends CardImpl { public AngelOfDespair (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}{B}{B}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AngelOfFinality.java b/Mage.Sets/src/mage/cards/a/AngelOfFinality.java index 4db2a7d9114..9777024d0be 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfFinality.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfFinality.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.target.TargetPlayer; import java.util.UUID; @@ -47,7 +48,7 @@ public class AngelOfFinality extends CardImpl { public AngelOfFinality(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AngelOfFlightAlabaster.java b/Mage.Sets/src/mage/cards/a/AngelOfFlightAlabaster.java index 59130ab309b..b35a96d15d8 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfFlightAlabaster.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfFlightAlabaster.java @@ -26,7 +26,7 @@ public class AngelOfFlightAlabaster extends CardImpl { public AngelOfFlightAlabaster(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AngelOfFury.java b/Mage.Sets/src/mage/cards/a/AngelOfFury.java index d29fe55c92c..57d53e69ebe 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfFury.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfFury.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,7 +46,7 @@ public class AngelOfFury extends CardImpl { public AngelOfFury(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AngelOfGlorysRise.java b/Mage.Sets/src/mage/cards/a/AngelOfGlorysRise.java index 654c8c5c556..87baab6df50 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfGlorysRise.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfGlorysRise.java @@ -56,7 +56,7 @@ public class AngelOfGlorysRise extends CardImpl { public AngelOfGlorysRise(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(4); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/AngelOfInvention.java b/Mage.Sets/src/mage/cards/a/AngelOfInvention.java index 8dd81a3f39a..0c80c065c67 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfInvention.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfInvention.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -50,7 +51,7 @@ public class AngelOfInvention extends CardImpl { public AngelOfInvention(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AngelOfJubilation.java b/Mage.Sets/src/mage/cards/a/AngelOfJubilation.java index 9fe8cc07ec2..32c7653721d 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfJubilation.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfJubilation.java @@ -65,7 +65,7 @@ public class AngelOfJubilation extends CardImpl { public AngelOfJubilation(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AngelOfLight.java b/Mage.Sets/src/mage/cards/a/AngelOfLight.java index ae796e5bb1e..e7e88b5de3c 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfLight.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfLight.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,7 +45,7 @@ public class AngelOfLight extends CardImpl { public AngelOfLight(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AngelOfMercy.java b/Mage.Sets/src/mage/cards/a/AngelOfMercy.java index d6bb7782f20..537dedc9387 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfMercy.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfMercy.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,7 +46,7 @@ public class AngelOfMercy extends CardImpl { public AngelOfMercy(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AngelOfRenewal.java b/Mage.Sets/src/mage/cards/a/AngelOfRenewal.java index 22d13112b8c..0dd1f7f0ac2 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfRenewal.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfRenewal.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; import java.util.UUID; @@ -47,8 +48,8 @@ public class AngelOfRenewal extends CardImpl { public AngelOfRenewal(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}"); - this.subtype.add("Angel"); - this.subtype.add("Ally"); + this.subtype.add(SubType.ANGEL); + this.subtype.add(SubType.ALLY); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AngelOfRetribution.java b/Mage.Sets/src/mage/cards/a/AngelOfRetribution.java index 03c63519bdd..fa68e258723 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfRetribution.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfRetribution.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,7 +45,7 @@ public class AngelOfRetribution extends CardImpl { public AngelOfRetribution(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{6}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AngelOfSalvation.java b/Mage.Sets/src/mage/cards/a/AngelOfSalvation.java index b0b4f0e5ef0..6bfc6bfebee 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfSalvation.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfSalvation.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.target.common.TargetCreatureOrPlayerAmount; import java.util.UUID; @@ -50,7 +51,7 @@ public class AngelOfSalvation extends CardImpl { public AngelOfSalvation(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{6}{W}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AngelOfSanctions.java b/Mage.Sets/src/mage/cards/a/AngelOfSanctions.java index 699b4689ac5..ac027a323df 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfSanctions.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfSanctions.java @@ -27,24 +27,26 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.delayed.OnLeaveReturnExiledToBattlefieldAbility; -import mage.abilities.keyword.FlyingAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.ExileUntilSourceLeavesEffect; import mage.abilities.keyword.EmbalmAbility; +import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterNonlandPermanent; import mage.filter.predicate.permanent.ControllerPredicate; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -60,7 +62,7 @@ public class AngelOfSanctions extends CardImpl { public AngelOfSanctions(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AngelOfSerenity.java b/Mage.Sets/src/mage/cards/a/AngelOfSerenity.java index d9dcc7da6bd..fa51fd50dc6 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfSerenity.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfSerenity.java @@ -40,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; @@ -64,7 +65,7 @@ public class AngelOfSerenity extends CardImpl { public AngelOfSerenity(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}{W}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(5); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/AngelOfTheDireHour.java b/Mage.Sets/src/mage/cards/a/AngelOfTheDireHour.java index 6f1d8edfbcd..9d377067278 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfTheDireHour.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfTheDireHour.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterAttackingCreature; import mage.watchers.common.CastFromHandWatcher; @@ -50,7 +51,7 @@ public class AngelOfTheDireHour extends CardImpl { public AngelOfTheDireHour(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AngelOfTheGodPharaoh.java b/Mage.Sets/src/mage/cards/a/AngelOfTheGodPharaoh.java index adab80fa29a..11180e9de0a 100644 --- a/Mage.Sets/src/mage/cards/a/AngelOfTheGodPharaoh.java +++ b/Mage.Sets/src/mage/cards/a/AngelOfTheGodPharaoh.java @@ -27,14 +27,16 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.CyclingAbility; +import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -45,7 +47,7 @@ public class AngelOfTheGodPharaoh extends CardImpl { public AngelOfTheGodPharaoh(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{W}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AngelfireCrusader.java b/Mage.Sets/src/mage/cards/a/AngelfireCrusader.java index 7877fd775b3..1e00e431989 100644 --- a/Mage.Sets/src/mage/cards/a/AngelfireCrusader.java +++ b/Mage.Sets/src/mage/cards/a/AngelfireCrusader.java @@ -34,10 +34,7 @@ import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Duration; -import mage.constants.Zone; +import mage.constants.*; import java.util.UUID; @@ -48,9 +45,9 @@ public class AngelfireCrusader extends CardImpl { public AngelfireCrusader(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); - this.subtype.add("Knight"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); + this.subtype.add(SubType.KNIGHT); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AngelicArbiter.java b/Mage.Sets/src/mage/cards/a/AngelicArbiter.java index a9fe7217a1d..459f5689961 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicArbiter.java +++ b/Mage.Sets/src/mage/cards/a/AngelicArbiter.java @@ -52,7 +52,7 @@ public class AngelicArbiter extends CardImpl { public AngelicArbiter(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{W}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(5); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/AngelicArmaments.java b/Mage.Sets/src/mage/cards/a/AngelicArmaments.java index 2b74a633a79..168d8bbdd06 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicArmaments.java +++ b/Mage.Sets/src/mage/cards/a/AngelicArmaments.java @@ -49,13 +49,13 @@ public class AngelicArmaments extends CardImpl { public AngelicArmaments(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}"); - this.subtype.add("Equipment"); + this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+2, has flying, and is a white Angel in addition to its other colors and types. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.EQUIPMENT))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddCardColorAttachedEffect(ObjectColor.WHITE, Duration.WhileOnBattlefield, AttachmentType.EQUIPMENT))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddCardSubtypeAttachedEffect("Angel", Duration.WhileOnBattlefield, AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddCardSubtypeAttachedEffect(SubType.ANGEL, Duration.WhileOnBattlefield, AttachmentType.EQUIPMENT))); // Equip {4} this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(4))); diff --git a/Mage.Sets/src/mage/cards/a/AngelicCaptain.java b/Mage.Sets/src/mage/cards/a/AngelicCaptain.java index d220ba06eb3..2e2e4c26385 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicCaptain.java +++ b/Mage.Sets/src/mage/cards/a/AngelicCaptain.java @@ -58,8 +58,8 @@ public class AngelicCaptain extends CardImpl { public AngelicCaptain(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{W}"); - this.subtype.add("Angel"); - this.subtype.add("Ally"); + this.subtype.add(SubType.ANGEL); + this.subtype.add(SubType.ALLY); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AngelicCurator.java b/Mage.Sets/src/mage/cards/a/AngelicCurator.java index a77a86ea8a1..0f524989c2c 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicCurator.java +++ b/Mage.Sets/src/mage/cards/a/AngelicCurator.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterArtifactCard; import java.util.UUID; @@ -45,8 +46,8 @@ public class AngelicCurator extends CardImpl { public AngelicCurator(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Angel"); - this.subtype.add("Spirit"); + this.subtype.add(SubType.ANGEL); + this.subtype.add(SubType.SPIRIT); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AngelicDestiny.java b/Mage.Sets/src/mage/cards/a/AngelicDestiny.java index 220c8aed0a5..21f9febbc87 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicDestiny.java +++ b/Mage.Sets/src/mage/cards/a/AngelicDestiny.java @@ -55,7 +55,7 @@ public class AngelicDestiny extends CardImpl { public AngelicDestiny(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}{W}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); @@ -72,7 +72,7 @@ public class AngelicDestiny extends CardImpl { effect = new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA); effect.setText("and first strike"); ability.addEffect(effect); - effect = new AddCardSubtypeAttachedEffect("Angel", Duration.WhileOnBattlefield, AttachmentType.AURA); + effect = new AddCardSubtypeAttachedEffect(SubType.ANGEL, Duration.WhileOnBattlefield, AttachmentType.AURA); effect.setText(", and is an Angel in addition to its other types"); ability.addEffect(effect); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AngelicFieldMarshal.java b/Mage.Sets/src/mage/cards/a/AngelicFieldMarshal.java index 7371c50b449..6854882938c 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicFieldMarshal.java +++ b/Mage.Sets/src/mage/cards/a/AngelicFieldMarshal.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.filter.common.FilterControlledCreaturePermanent; import java.util.UUID; @@ -49,7 +50,7 @@ public class AngelicFieldMarshal extends CardImpl { public AngelicFieldMarshal(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AngelicGift.java b/Mage.Sets/src/mage/cards/a/AngelicGift.java index 67ec89e9739..e769996a7a5 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicGift.java +++ b/Mage.Sets/src/mage/cards/a/AngelicGift.java @@ -37,10 +37,7 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -54,7 +51,7 @@ public class AngelicGift extends CardImpl { public AngelicGift(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{W}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/cards/a/AngelicOverseer.java b/Mage.Sets/src/mage/cards/a/AngelicOverseer.java index 1bdaf8df4c9..49df89e2b97 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicOverseer.java +++ b/Mage.Sets/src/mage/cards/a/AngelicOverseer.java @@ -62,7 +62,7 @@ public class AngelicOverseer extends CardImpl { public AngelicOverseer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.color.setWhite(true); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AngelicPage.java b/Mage.Sets/src/mage/cards/a/AngelicPage.java index a3810ca6f9c..54bf50ec367 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicPage.java +++ b/Mage.Sets/src/mage/cards/a/AngelicPage.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterAttackingOrBlockingCreature; import mage.target.common.TargetCreaturePermanent; @@ -51,8 +52,8 @@ public class AngelicPage extends CardImpl { public AngelicPage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Angel"); - this.subtype.add("Spirit"); + this.subtype.add(SubType.ANGEL); + this.subtype.add(SubType.SPIRIT); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AngelicProtector.java b/Mage.Sets/src/mage/cards/a/AngelicProtector.java index 4d2f774246c..0b1fa33def3 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicProtector.java +++ b/Mage.Sets/src/mage/cards/a/AngelicProtector.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import java.util.UUID; @@ -46,7 +47,7 @@ public class AngelicProtector extends CardImpl { public AngelicProtector(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AngelicSkirmisher.java b/Mage.Sets/src/mage/cards/a/AngelicSkirmisher.java index dc0b0550281..838c3ab02a1 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicSkirmisher.java +++ b/Mage.Sets/src/mage/cards/a/AngelicSkirmisher.java @@ -40,10 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.choices.Choice; import mage.choices.ChoiceImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; +import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -61,7 +58,7 @@ public class AngelicSkirmisher extends CardImpl { public AngelicSkirmisher(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AngelicWall.java b/Mage.Sets/src/mage/cards/a/AngelicWall.java index 528e6193c45..fb103010e67 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicWall.java +++ b/Mage.Sets/src/mage/cards/a/AngelicWall.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,7 +45,7 @@ public class AngelicWall extends CardImpl { public AngelicWall(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Wall"); + this.subtype.add(SubType.WALL); this.power = new MageInt(0); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AngelsHerald.java b/Mage.Sets/src/mage/cards/a/AngelsHerald.java index 6303c8dd16c..864fa972746 100644 --- a/Mage.Sets/src/mage/cards/a/AngelsHerald.java +++ b/Mage.Sets/src/mage/cards/a/AngelsHerald.java @@ -38,6 +38,7 @@ import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterControlledCreaturePermanent; @@ -67,8 +68,8 @@ public class AngelsHerald extends CardImpl { public AngelsHerald(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}"); - this.subtype.add("Human"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AngelsTomb.java b/Mage.Sets/src/mage/cards/a/AngelsTomb.java index 2c7efe99ede..13f3c996926 100644 --- a/Mage.Sets/src/mage/cards/a/AngelsTomb.java +++ b/Mage.Sets/src/mage/cards/a/AngelsTomb.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.game.permanent.token.Token; import java.util.UUID; @@ -70,7 +71,7 @@ class AngelTombToken extends Token { cardType.add(CardType.CREATURE); color.setWhite(true); - subtype.add("Angel"); + subtype.add(SubType.ANGEL); power = new MageInt(3); toughness = new MageInt(3); addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/cards/a/Anger.java b/Mage.Sets/src/mage/cards/a/Anger.java index b5c4d17a05e..3ef38407e22 100644 --- a/Mage.Sets/src/mage/cards/a/Anger.java +++ b/Mage.Sets/src/mage/cards/a/Anger.java @@ -64,7 +64,7 @@ public class Anger extends CardImpl { public Anger(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); - this.subtype.add("Incarnation"); + this.subtype.add(SubType.INCARNATION); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AnglerDrake.java b/Mage.Sets/src/mage/cards/a/AnglerDrake.java index 98b9ca49eee..062122f69c3 100644 --- a/Mage.Sets/src/mage/cards/a/AnglerDrake.java +++ b/Mage.Sets/src/mage/cards/a/AnglerDrake.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -36,8 +35,11 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -47,7 +49,7 @@ public class AnglerDrake extends CardImpl { public AnglerDrake(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{U}{U}"); - this.subtype.add("Drake"); + this.subtype.add(SubType.DRAKE); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AngryMob.java b/Mage.Sets/src/mage/cards/a/AngryMob.java index 53b736b94ec..3d11b710a31 100644 --- a/Mage.Sets/src/mage/cards/a/AngryMob.java +++ b/Mage.Sets/src/mage/cards/a/AngryMob.java @@ -59,7 +59,7 @@ public class AngryMob extends CardImpl { public AngryMob(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}{W}"); - this.subtype.add("Human"); + this.subtype.add(SubType.HUMAN); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AngusMackenzie.java b/Mage.Sets/src/mage/cards/a/AngusMackenzie.java index 32bff00ff0e..44697692ac7 100644 --- a/Mage.Sets/src/mage/cards/a/AngusMackenzie.java +++ b/Mage.Sets/src/mage/cards/a/AngusMackenzie.java @@ -51,8 +51,8 @@ public class AngusMackenzie extends CardImpl { public AngusMackenzie(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}{W}{U}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Human"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java b/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java index 394053717c7..310f42ac3a2 100644 --- a/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java +++ b/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java @@ -57,7 +57,7 @@ public class AnimalBoneyard extends CardImpl { public AnimalBoneyard(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant land TargetPermanent auraTarget = new TargetLandPermanent(); diff --git a/Mage.Sets/src/mage/cards/a/AnimarSoulOfElements.java b/Mage.Sets/src/mage/cards/a/AnimarSoulOfElements.java index dc72fb7b7ba..0b29d8b366b 100644 --- a/Mage.Sets/src/mage/cards/a/AnimarSoulOfElements.java +++ b/Mage.Sets/src/mage/cards/a/AnimarSoulOfElements.java @@ -58,7 +58,7 @@ public class AnimarSoulOfElements extends CardImpl { public AnimarSoulOfElements(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{U}{R}{G}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Elemental"); + this.subtype.add(SubType.ELEMENTAL); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AnimateArtifact.java b/Mage.Sets/src/mage/cards/a/AnimateArtifact.java index f2f9e9ba8e4..92f59dafbaf 100644 --- a/Mage.Sets/src/mage/cards/a/AnimateArtifact.java +++ b/Mage.Sets/src/mage/cards/a/AnimateArtifact.java @@ -60,7 +60,7 @@ public class AnimateArtifact extends CardImpl { public AnimateArtifact(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant artifact TargetPermanent auraTarget = new TargetArtifactPermanent(); diff --git a/Mage.Sets/src/mage/cards/a/AnimateDead.java b/Mage.Sets/src/mage/cards/a/AnimateDead.java index b1219334977..b4644a49b33 100644 --- a/Mage.Sets/src/mage/cards/a/AnimateDead.java +++ b/Mage.Sets/src/mage/cards/a/AnimateDead.java @@ -63,7 +63,7 @@ public class AnimateDead extends CardImpl { public AnimateDead(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{B}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature card in a graveyard TargetCardInGraveyard auraTarget = new TargetCardInGraveyard(new FilterCreatureCard("creature card in a graveyard")); diff --git a/Mage.Sets/src/mage/cards/a/AnimateWall.java b/Mage.Sets/src/mage/cards/a/AnimateWall.java index 2b6c15a5a89..4d9557c455e 100644 --- a/Mage.Sets/src/mage/cards/a/AnimateWall.java +++ b/Mage.Sets/src/mage/cards/a/AnimateWall.java @@ -58,7 +58,7 @@ public class AnimateWall extends CardImpl { public AnimateWall(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{W}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant Wall diff --git a/Mage.Sets/src/mage/cards/a/AnkleShanker.java b/Mage.Sets/src/mage/cards/a/AnkleShanker.java index 03eca9c9fcd..3a4eba8488b 100644 --- a/Mage.Sets/src/mage/cards/a/AnkleShanker.java +++ b/Mage.Sets/src/mage/cards/a/AnkleShanker.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.filter.StaticFilters; import java.util.UUID; @@ -51,8 +52,8 @@ public class AnkleShanker extends CardImpl { public AnkleShanker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{W}{B}"); - this.subtype.add("Goblin"); - this.subtype.add("Berserker"); + this.subtype.add(SubType.GOBLIN); + this.subtype.add(SubType.BERSERKER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/Annex.java b/Mage.Sets/src/mage/cards/a/Annex.java index 7e7bb91e6cb..1bdad398788 100644 --- a/Mage.Sets/src/mage/cards/a/Annex.java +++ b/Mage.Sets/src/mage/cards/a/Annex.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; @@ -50,7 +51,7 @@ public class Annex extends CardImpl { public Annex(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{U}{U}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant land diff --git a/Mage.Sets/src/mage/cards/a/AnodetLurker.java b/Mage.Sets/src/mage/cards/a/AnodetLurker.java index a5e4e9b946d..4ed4f2163a0 100644 --- a/Mage.Sets/src/mage/cards/a/AnodetLurker.java +++ b/Mage.Sets/src/mage/cards/a/AnodetLurker.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,7 +45,7 @@ public class AnodetLurker extends CardImpl { public AnodetLurker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{5}"); - this.subtype.add("Construct"); + this.subtype.add(SubType.CONSTRUCT); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AnointerOfChampions.java b/Mage.Sets/src/mage/cards/a/AnointerOfChampions.java index 2d14b85606e..c1f9eee12db 100644 --- a/Mage.Sets/src/mage/cards/a/AnointerOfChampions.java +++ b/Mage.Sets/src/mage/cards/a/AnointerOfChampions.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetAttackingCreature; @@ -49,8 +50,8 @@ public class AnointerOfChampions extends CardImpl { public AnointerOfChampions(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}"); - this.subtype.add("Human"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AnointerPriest.java b/Mage.Sets/src/mage/cards/a/AnointerPriest.java index dbcbe3a8664..f389bb00319 100644 --- a/Mage.Sets/src/mage/cards/a/AnointerPriest.java +++ b/Mage.Sets/src/mage/cards/a/AnointerPriest.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -36,10 +35,13 @@ import mage.abilities.keyword.EmbalmAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.TokenPredicate; +import java.util.UUID; + /** * * @author LevelX2 @@ -55,8 +57,8 @@ public class AnointerPriest extends CardImpl { public AnointerPriest(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}"); - this.subtype.add("Human"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AnowonTheRuinSage.java b/Mage.Sets/src/mage/cards/a/AnowonTheRuinSage.java index 2df61452a09..4c879ca1b04 100644 --- a/Mage.Sets/src/mage/cards/a/AnowonTheRuinSage.java +++ b/Mage.Sets/src/mage/cards/a/AnowonTheRuinSage.java @@ -57,8 +57,8 @@ public class AnowonTheRuinSage extends CardImpl { public AnowonTheRuinSage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Vampire"); - this.subtype.add("Shaman"); + this.subtype.add(SubType.VAMPIRE); + this.subtype.add(SubType.SHAMAN); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AntQueen.java b/Mage.Sets/src/mage/cards/a/AntQueen.java index 555bb7f3b1e..7a30fdbf891 100644 --- a/Mage.Sets/src/mage/cards/a/AntQueen.java +++ b/Mage.Sets/src/mage/cards/a/AntQueen.java @@ -35,6 +35,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.permanent.token.InsectToken; @@ -50,7 +51,7 @@ public class AntQueen extends CardImpl { public AntQueen(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}"); - this.subtype.add("Insect"); + this.subtype.add(SubType.INSECT); this.power = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AnthousaSetessanHero.java b/Mage.Sets/src/mage/cards/a/AnthousaSetessanHero.java index 75df207e877..5feffe0bffb 100644 --- a/Mage.Sets/src/mage/cards/a/AnthousaSetessanHero.java +++ b/Mage.Sets/src/mage/cards/a/AnthousaSetessanHero.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterControlledLandPermanent; import mage.game.permanent.token.Token; @@ -51,8 +52,8 @@ public class AnthousaSetessanHero extends CardImpl { public AnthousaSetessanHero(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}"); this.addSuperType(SuperType.LEGENDARY); - this.subtype.add("Human"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(4); this.toughness = new MageInt(5); @@ -78,7 +79,7 @@ class AnthousaWarriorToken extends Token { public AnthousaWarriorToken() { super("", "2/2 Warrior creatures"); cardType.add(CardType.CREATURE); - subtype.add("Warrior"); + subtype.add(SubType.WARRIOR); power = new MageInt(2); toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/cards/a/Anthroplasm.java b/Mage.Sets/src/mage/cards/a/Anthroplasm.java index 1dea93ba20d..2b1256b9f15 100644 --- a/Mage.Sets/src/mage/cards/a/Anthroplasm.java +++ b/Mage.Sets/src/mage/cards/a/Anthroplasm.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; @@ -54,7 +55,7 @@ public class Anthroplasm extends CardImpl { public Anthroplasm(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}"); - this.subtype.add("Shapeshifter"); + this.subtype.add(SubType.SHAPESHIFTER); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/a/AntlerSkulkin.java b/Mage.Sets/src/mage/cards/a/AntlerSkulkin.java index 9e1724ce9be..761f0452c7b 100644 --- a/Mage.Sets/src/mage/cards/a/AntlerSkulkin.java +++ b/Mage.Sets/src/mage/cards/a/AntlerSkulkin.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; @@ -60,7 +61,7 @@ public class AntlerSkulkin extends CardImpl { public AntlerSkulkin(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{5}"); - this.subtype.add("Scarecrow"); + this.subtype.add(SubType.SCARECROW); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AnuridBarkripper.java b/Mage.Sets/src/mage/cards/a/AnuridBarkripper.java index ca3ea0b9550..6529faed6b4 100644 --- a/Mage.Sets/src/mage/cards/a/AnuridBarkripper.java +++ b/Mage.Sets/src/mage/cards/a/AnuridBarkripper.java @@ -35,10 +35,7 @@ import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AbilityWord; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; +import mage.constants.*; import java.util.UUID; @@ -50,8 +47,8 @@ public class AnuridBarkripper extends CardImpl { public AnuridBarkripper(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}{G}"); - this.subtype.add("Frog"); - this.subtype.add("Beast"); + this.subtype.add(SubType.FROG); + this.subtype.add(SubType.BEAST); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AnuridBrushhopper.java b/Mage.Sets/src/mage/cards/a/AnuridBrushhopper.java index f0eda5292eb..108aaabac57 100644 --- a/Mage.Sets/src/mage/cards/a/AnuridBrushhopper.java +++ b/Mage.Sets/src/mage/cards/a/AnuridBrushhopper.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.ExileReturnBattlefieldOwnerNextEndStepSourc import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.target.common.TargetCardInHand; @@ -48,8 +49,8 @@ public class AnuridBrushhopper extends CardImpl { public AnuridBrushhopper(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}{W}"); - this.subtype.add("Frog"); - this.subtype.add("Beast"); + this.subtype.add(SubType.FROG); + this.subtype.add(SubType.BEAST); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AnuridMurkdiver.java b/Mage.Sets/src/mage/cards/a/AnuridMurkdiver.java index b0d62d4e615..afa9731cfd3 100644 --- a/Mage.Sets/src/mage/cards/a/AnuridMurkdiver.java +++ b/Mage.Sets/src/mage/cards/a/AnuridMurkdiver.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.SwampwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,9 +44,9 @@ public class AnuridMurkdiver extends CardImpl { public AnuridMurkdiver(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{B}"); - this.subtype.add("Zombie"); - this.subtype.add("Frog"); - this.subtype.add("Beast"); + this.subtype.add(SubType.ZOMBIE); + this.subtype.add(SubType.FROG); + this.subtype.add(SubType.BEAST); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AnuridSwarmsnapper.java b/Mage.Sets/src/mage/cards/a/AnuridSwarmsnapper.java index 71fa40c60a7..6702343d757 100644 --- a/Mage.Sets/src/mage/cards/a/AnuridSwarmsnapper.java +++ b/Mage.Sets/src/mage/cards/a/AnuridSwarmsnapper.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -48,8 +49,8 @@ public class AnuridSwarmsnapper extends CardImpl { public AnuridSwarmsnapper(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); - this.subtype.add("Frog"); - this.subtype.add("Beast"); + this.subtype.add(SubType.FROG); + this.subtype.add(SubType.BEAST); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AnvilwroughtRaptor.java b/Mage.Sets/src/mage/cards/a/AnvilwroughtRaptor.java index 461d975b9e9..18f350007b4 100644 --- a/Mage.Sets/src/mage/cards/a/AnvilwroughtRaptor.java +++ b/Mage.Sets/src/mage/cards/a/AnvilwroughtRaptor.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,7 +45,7 @@ public class AnvilwroughtRaptor extends CardImpl { public AnvilwroughtRaptor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{4}"); - this.subtype.add("Bird"); + this.subtype.add(SubType.BIRD); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AnyaMercilessAngel.java b/Mage.Sets/src/mage/cards/a/AnyaMercilessAngel.java index c0ef10ef1a0..d6099e5ce32 100644 --- a/Mage.Sets/src/mage/cards/a/AnyaMercilessAngel.java +++ b/Mage.Sets/src/mage/cards/a/AnyaMercilessAngel.java @@ -41,10 +41,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; @@ -59,7 +56,7 @@ public class AnyaMercilessAngel extends CardImpl { public AnyaMercilessAngel(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{W}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/ApesOfRath.java b/Mage.Sets/src/mage/cards/a/ApesOfRath.java index 77a7e5a1bad..ec6c6e7573e 100644 --- a/Mage.Sets/src/mage/cards/a/ApesOfRath.java +++ b/Mage.Sets/src/mage/cards/a/ApesOfRath.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.DontUntapInControllersNextUntapStepSourceEf import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,7 +45,7 @@ public class ApesOfRath extends CardImpl { public ApesOfRath(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}"); - this.subtype.add("Ape"); + this.subtype.add(SubType.APE); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/ApexHawks.java b/Mage.Sets/src/mage/cards/a/ApexHawks.java index 863b99b1dfb..9eb37e15ba6 100644 --- a/Mage.Sets/src/mage/cards/a/ApexHawks.java +++ b/Mage.Sets/src/mage/cards/a/ApexHawks.java @@ -36,6 +36,7 @@ import mage.abilities.keyword.MultikickerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.counters.CounterType; import java.util.UUID; @@ -48,7 +49,7 @@ public class ApexHawks extends CardImpl { public ApexHawks(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.subtype.add("Bird"); + this.subtype.add(SubType.BIRD); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AphettoAlchemist.java b/Mage.Sets/src/mage/cards/a/AphettoAlchemist.java index d8b799f8d20..bb2484cba8e 100644 --- a/Mage.Sets/src/mage/cards/a/AphettoAlchemist.java +++ b/Mage.Sets/src/mage/cards/a/AphettoAlchemist.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.MorphAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; @@ -61,8 +62,8 @@ public class AphettoAlchemist extends CardImpl { public AphettoAlchemist(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AphettoGrifter.java b/Mage.Sets/src/mage/cards/a/AphettoGrifter.java index 976c591495c..bac7ebb9b92 100644 --- a/Mage.Sets/src/mage/cards/a/AphettoGrifter.java +++ b/Mage.Sets/src/mage/cards/a/AphettoGrifter.java @@ -61,8 +61,8 @@ public class AphettoGrifter extends CardImpl { public AphettoGrifter(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AphettoRunecaster.java b/Mage.Sets/src/mage/cards/a/AphettoRunecaster.java index 1323150acf2..7bb75c22289 100644 --- a/Mage.Sets/src/mage/cards/a/AphettoRunecaster.java +++ b/Mage.Sets/src/mage/cards/a/AphettoRunecaster.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; @@ -46,8 +47,8 @@ public class AphettoRunecaster extends CardImpl { public AphettoRunecaster(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/ApocalypseDemon.java b/Mage.Sets/src/mage/cards/a/ApocalypseDemon.java index b68ac32e58e..26a369c7504 100644 --- a/Mage.Sets/src/mage/cards/a/ApocalypseDemon.java +++ b/Mage.Sets/src/mage/cards/a/ApocalypseDemon.java @@ -1,6 +1,5 @@ package mage.cards.a; -import java.util.UUID; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.SacrificeTargetCost; @@ -10,15 +9,14 @@ import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + public class ApocalypseDemon extends CardImpl { private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("nother creature"); @@ -30,7 +28,7 @@ public class ApocalypseDemon extends CardImpl { public ApocalypseDemon(UUID ownerId, CardSetInfo cardSetInfo) { super(ownerId, cardSetInfo, new CardType[]{CardType.CREATURE}, "{4}{B}{B}"); - subtype.add("Demon"); + subtype.add(SubType.DEMON); // Flying this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/cards/a/ApocalypseHydra.java b/Mage.Sets/src/mage/cards/a/ApocalypseHydra.java index 5a9fca8f82b..5b815f8d012 100644 --- a/Mage.Sets/src/mage/cards/a/ApocalypseHydra.java +++ b/Mage.Sets/src/mage/cards/a/ApocalypseHydra.java @@ -41,6 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.game.Game; @@ -57,7 +58,7 @@ public class ApocalypseHydra extends CardImpl { public ApocalypseHydra(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{X}{R}{G}"); - this.subtype.add("Hydra"); + this.subtype.add(SubType.HYDRA); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/a/ApothecaryGeist.java b/Mage.Sets/src/mage/cards/a/ApothecaryGeist.java index f3c4161d3f9..30b62235ae7 100644 --- a/Mage.Sets/src/mage/cards/a/ApothecaryGeist.java +++ b/Mage.Sets/src/mage/cards/a/ApothecaryGeist.java @@ -60,7 +60,7 @@ public class ApothecaryGeist extends CardImpl { public ApothecaryGeist(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add("Spirit"); + this.subtype.add(SubType.SPIRIT); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/ApothecaryInitiate.java b/Mage.Sets/src/mage/cards/a/ApothecaryInitiate.java index 08eebebe604..0ab192ad7ef 100644 --- a/Mage.Sets/src/mage/cards/a/ApothecaryInitiate.java +++ b/Mage.Sets/src/mage/cards/a/ApothecaryInitiate.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; @@ -56,8 +57,8 @@ public class ApothecaryInitiate extends CardImpl { public ApothecaryInitiate(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}"); - this.subtype.add("Kithkin"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.KITHKIN); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/ApprenticeNecromancer.java b/Mage.Sets/src/mage/cards/a/ApprenticeNecromancer.java index 6ef369d6285..123263018e1 100644 --- a/Mage.Sets/src/mage/cards/a/ApprenticeNecromancer.java +++ b/Mage.Sets/src/mage/cards/a/ApprenticeNecromancer.java @@ -62,8 +62,8 @@ public class ApprenticeNecromancer extends CardImpl { public ApprenticeNecromancer(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}"); - this.subtype.add("Zombie"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.ZOMBIE); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/ApprenticeSorcerer.java b/Mage.Sets/src/mage/cards/a/ApprenticeSorcerer.java index df8e0adc3b4..01588ebc2cc 100644 --- a/Mage.Sets/src/mage/cards/a/ApprenticeSorcerer.java +++ b/Mage.Sets/src/mage/cards/a/ApprenticeSorcerer.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; @@ -49,8 +50,8 @@ public class ApprenticeSorcerer extends CardImpl { public ApprenticeSorcerer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/ApprenticeWizard.java b/Mage.Sets/src/mage/cards/a/ApprenticeWizard.java index 2e9199a8284..a99fb447d35 100644 --- a/Mage.Sets/src/mage/cards/a/ApprenticeWizard.java +++ b/Mage.Sets/src/mage/cards/a/ApprenticeWizard.java @@ -36,6 +36,7 @@ import mage.abilities.mana.SimpleManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -48,8 +49,8 @@ public class ApprenticeWizard extends CardImpl { public ApprenticeWizard(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{U}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AqualishBountyHunter.java b/Mage.Sets/src/mage/cards/a/AqualishBountyHunter.java index 4c78910661d..1a50b54f300 100644 --- a/Mage.Sets/src/mage/cards/a/AqualishBountyHunter.java +++ b/Mage.Sets/src/mage/cards/a/AqualishBountyHunter.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.BountyAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.target.TargetPlayer; import java.util.UUID; @@ -46,8 +47,8 @@ public class AqualishBountyHunter extends CardImpl { public AqualishBountyHunter(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}"); - this.subtype.add("Aqualish"); - this.subtype.add("Hunter"); + this.subtype.add(SubType.AQUALISH); + this.subtype.add(SubType.HUNTER); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/Aquamoeba.java b/Mage.Sets/src/mage/cards/a/Aquamoeba.java index aba67e1edef..79c9f172ad6 100644 --- a/Mage.Sets/src/mage/cards/a/Aquamoeba.java +++ b/Mage.Sets/src/mage/cards/a/Aquamoeba.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -48,8 +49,8 @@ public class Aquamoeba extends CardImpl { public Aquamoeba(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); - this.subtype.add("Elemental"); - this.subtype.add("Beast"); + this.subtype.add(SubType.ELEMENTAL); + this.subtype.add(SubType.BEAST); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AquamorphEntity.java b/Mage.Sets/src/mage/cards/a/AquamorphEntity.java index 4524c52c54c..64f7735c72d 100644 --- a/Mage.Sets/src/mage/cards/a/AquamorphEntity.java +++ b/Mage.Sets/src/mage/cards/a/AquamorphEntity.java @@ -56,7 +56,7 @@ public class AquamorphEntity extends CardImpl { public AquamorphEntity(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}"); - this.subtype.add("Shapeshifter"); + this.subtype.add(SubType.SHAPESHIFTER); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/a/AquastrandSpider.java b/Mage.Sets/src/mage/cards/a/AquastrandSpider.java index 3fa1613b566..ee67e963a10 100644 --- a/Mage.Sets/src/mage/cards/a/AquastrandSpider.java +++ b/Mage.Sets/src/mage/cards/a/AquastrandSpider.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; @@ -59,8 +60,8 @@ public class AquastrandSpider extends CardImpl { public AquastrandSpider(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); - this.subtype.add("Spider"); - this.subtype.add("Mutant"); + this.subtype.add(SubType.SPIDER); + this.subtype.add(SubType.MUTANT); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/a/AqueousForm.java b/Mage.Sets/src/mage/cards/a/AqueousForm.java index 8f348432183..cdb80cd67dc 100644 --- a/Mage.Sets/src/mage/cards/a/AqueousForm.java +++ b/Mage.Sets/src/mage/cards/a/AqueousForm.java @@ -36,10 +36,7 @@ import mage.abilities.effects.keyword.ScryEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -53,7 +50,7 @@ public class AqueousForm extends CardImpl { public AqueousForm(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{U}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature diff --git a/Mage.Sets/src/mage/cards/a/AquitectsWill.java b/Mage.Sets/src/mage/cards/a/AquitectsWill.java index d3bdac1840a..3ce9b9d3612 100644 --- a/Mage.Sets/src/mage/cards/a/AquitectsWill.java +++ b/Mage.Sets/src/mage/cards/a/AquitectsWill.java @@ -59,7 +59,7 @@ public class AquitectsWill extends CardImpl { public AquitectsWill(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.SORCERY},"{U}"); - this.subtype.add("Merfolk"); + this.subtype.add(SubType.MERFOLK); // Put a flood counter on target land. this.getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.FLOOD.createInstance())); diff --git a/Mage.Sets/src/mage/cards/a/AquusSteed.java b/Mage.Sets/src/mage/cards/a/AquusSteed.java index 3ce227c730a..8bde7ddc6bd 100644 --- a/Mage.Sets/src/mage/cards/a/AquusSteed.java +++ b/Mage.Sets/src/mage/cards/a/AquusSteed.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; @@ -50,7 +51,7 @@ public class AquusSteed extends CardImpl { public AquusSteed(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}"); - this.subtype.add("Beast"); + this.subtype.add(SubType.BEAST); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/ArabaMothrider.java b/Mage.Sets/src/mage/cards/a/ArabaMothrider.java index acb4a3ec158..7c38ac147fc 100644 --- a/Mage.Sets/src/mage/cards/a/ArabaMothrider.java +++ b/Mage.Sets/src/mage/cards/a/ArabaMothrider.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,8 +45,8 @@ public class ArabaMothrider extends CardImpl { public ArabaMothrider(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Human"); - this.subtype.add("Samurai"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SAMURAI); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/Arachnoid.java b/Mage.Sets/src/mage/cards/a/Arachnoid.java index 00a926d51ae..66214eb21b5 100644 --- a/Mage.Sets/src/mage/cards/a/Arachnoid.java +++ b/Mage.Sets/src/mage/cards/a/Arachnoid.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,7 +44,7 @@ public class Arachnoid extends CardImpl { public Arachnoid(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{6}"); - this.subtype.add("Spider"); + this.subtype.add(SubType.SPIDER); this.power = new MageInt(2); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java b/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java index f4563ce448b..e240d20185f 100644 --- a/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java +++ b/Mage.Sets/src/mage/cards/a/ArachnusSpinner.java @@ -71,7 +71,7 @@ public class ArachnusSpinner extends CardImpl { public ArachnusSpinner(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{G}"); - this.subtype.add("Spider"); + this.subtype.add(SubType.SPIDER); this.power = new MageInt(5); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/a/ArachnusWeb.java b/Mage.Sets/src/mage/cards/a/ArachnusWeb.java index e4148b6e239..7cc0311489c 100644 --- a/Mage.Sets/src/mage/cards/a/ArachnusWeb.java +++ b/Mage.Sets/src/mage/cards/a/ArachnusWeb.java @@ -28,7 +28,7 @@ package mage.cards.a; import mage.abilities.Ability; -import mage.constants.ComparisonType; +import mage.constants.*; import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.AttachedToMatchesFilterCondition; @@ -38,10 +38,6 @@ import mage.abilities.effects.common.combat.CantBlockAttackActivateAttachedEffec import mage.abilities.keyword.EnchantAbility; 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.filter.FilterPermanent; import mage.filter.predicate.mageobject.PowerPredicate; import mage.target.TargetPermanent; @@ -57,7 +53,7 @@ public class ArachnusWeb extends CardImpl { public ArachnusWeb(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/cards/a/AradaraExpress.java b/Mage.Sets/src/mage/cards/a/AradaraExpress.java index ef77fec67a4..20e176d12b5 100644 --- a/Mage.Sets/src/mage/cards/a/AradaraExpress.java +++ b/Mage.Sets/src/mage/cards/a/AradaraExpress.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.MenaceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,7 +45,7 @@ public class AradaraExpress extends CardImpl { public AradaraExpress(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}"); - this.subtype.add("Vehicle"); + this.subtype.add(SubType.VEHICLE); this.power = new MageInt(8); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/ArashiTheSkyAsunder.java b/Mage.Sets/src/mage/cards/a/ArashiTheSkyAsunder.java index 48e28ea55b4..0127410664c 100644 --- a/Mage.Sets/src/mage/cards/a/ArashiTheSkyAsunder.java +++ b/Mage.Sets/src/mage/cards/a/ArashiTheSkyAsunder.java @@ -40,6 +40,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; @@ -63,7 +64,7 @@ public class ArashiTheSkyAsunder extends CardImpl { public ArashiTheSkyAsunder(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Spirit"); + this.subtype.add(SubType.SPIRIT); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/ArashinCleric.java b/Mage.Sets/src/mage/cards/a/ArashinCleric.java index 7997b70f666..b591a32b1aa 100644 --- a/Mage.Sets/src/mage/cards/a/ArashinCleric.java +++ b/Mage.Sets/src/mage/cards/a/ArashinCleric.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,8 +45,8 @@ public class ArashinCleric extends CardImpl { public ArashinCleric(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Human"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/ArashinForemost.java b/Mage.Sets/src/mage/cards/a/ArashinForemost.java index 2d963e36d8c..d2915230f12 100644 --- a/Mage.Sets/src/mage/cards/a/ArashinForemost.java +++ b/Mage.Sets/src/mage/cards/a/ArashinForemost.java @@ -59,8 +59,8 @@ public class ArashinForemost extends CardImpl { public ArashinForemost(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}{W}"); - this.subtype.add("Human"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/ArashinSovereign.java b/Mage.Sets/src/mage/cards/a/ArashinSovereign.java index 8565087f06b..534189d607a 100644 --- a/Mage.Sets/src/mage/cards/a/ArashinSovereign.java +++ b/Mage.Sets/src/mage/cards/a/ArashinSovereign.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; @@ -51,7 +52,7 @@ public class ArashinSovereign extends CardImpl { public ArashinSovereign(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{G}{W}"); - this.subtype.add("Dragon"); + this.subtype.add(SubType.DRAGON); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/ArashinWarBeast.java b/Mage.Sets/src/mage/cards/a/ArashinWarBeast.java index ae00c407dc6..1bbc3b47319 100644 --- a/Mage.Sets/src/mage/cards/a/ArashinWarBeast.java +++ b/Mage.Sets/src/mage/cards/a/ArashinWarBeast.java @@ -34,6 +34,7 @@ import mage.abilities.effects.keyword.ManifestEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.BlockingPredicate; @@ -53,7 +54,7 @@ public class ArashinWarBeast extends CardImpl { public ArashinWarBeast(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{G}{G}"); - this.subtype.add("Beast"); + this.subtype.add(SubType.BEAST); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/ArbalestElite.java b/Mage.Sets/src/mage/cards/a/ArbalestElite.java index 4c612a9c2b5..412591723ca 100644 --- a/Mage.Sets/src/mage/cards/a/ArbalestElite.java +++ b/Mage.Sets/src/mage/cards/a/ArbalestElite.java @@ -37,6 +37,7 @@ import mage.abilities.effects.common.DontUntapInControllersNextUntapStepSourceEf import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetAttackingOrBlockingCreature; @@ -50,8 +51,8 @@ public class ArbalestElite extends CardImpl { public ArbalestElite(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}"); - this.subtype.add("Human"); - this.subtype.add("Archer"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.ARCHER); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/ArbiterOfKnollridge.java b/Mage.Sets/src/mage/cards/a/ArbiterOfKnollridge.java index daf4302bc51..5797742278a 100644 --- a/Mage.Sets/src/mage/cards/a/ArbiterOfKnollridge.java +++ b/Mage.Sets/src/mage/cards/a/ArbiterOfKnollridge.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.game.Game; import mage.players.Player; import mage.players.PlayerList; @@ -50,8 +51,8 @@ public class ArbiterOfKnollridge extends CardImpl { public ArbiterOfKnollridge(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{6}{W}"); - this.subtype.add("Giant"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.GIANT); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/ArbiterOfTheIdeal.java b/Mage.Sets/src/mage/cards/a/ArbiterOfTheIdeal.java index eaea3de63ce..e3b4d3f9486 100644 --- a/Mage.Sets/src/mage/cards/a/ArbiterOfTheIdeal.java +++ b/Mage.Sets/src/mage/cards/a/ArbiterOfTheIdeal.java @@ -35,10 +35,7 @@ import mage.abilities.effects.common.continuous.AddCardTypeTargetEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.InspiredAbility; import mage.cards.*; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.Counter; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; @@ -58,7 +55,7 @@ public class ArbiterOfTheIdeal extends CardImpl { public ArbiterOfTheIdeal(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}{U}"); - this.subtype.add("Sphinx"); + this.subtype.add(SubType.SPHINX); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/ArborColossus.java b/Mage.Sets/src/mage/cards/a/ArborColossus.java index 09142373925..4888884ccea 100644 --- a/Mage.Sets/src/mage/cards/a/ArborColossus.java +++ b/Mage.Sets/src/mage/cards/a/ArborColossus.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; @@ -60,7 +61,7 @@ public class ArborColossus extends CardImpl { public ArborColossus(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}{G}"); - this.subtype.add("Giant"); + this.subtype.add(SubType.GIANT); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/ArborElf.java b/Mage.Sets/src/mage/cards/a/ArborElf.java index 697b9fef0c0..d9e03f6f07c 100644 --- a/Mage.Sets/src/mage/cards/a/ArborElf.java +++ b/Mage.Sets/src/mage/cards/a/ArborElf.java @@ -53,8 +53,8 @@ public class ArborElf extends CardImpl { public ArborElf(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}"); - this.subtype.add("Elf"); - this.subtype.add("Druid"); + this.subtype.add(SubType.ELF); + this.subtype.add(SubType.DRUID); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/ArborbackStomper.java b/Mage.Sets/src/mage/cards/a/ArborbackStomper.java index 7d35f744c21..08d495b6b80 100644 --- a/Mage.Sets/src/mage/cards/a/ArborbackStomper.java +++ b/Mage.Sets/src/mage/cards/a/ArborbackStomper.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,7 +46,7 @@ public class ArborbackStomper extends CardImpl { public ArborbackStomper(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}"); - this.subtype.add("Beast"); + this.subtype.add(SubType.BEAST); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/ArcMage.java b/Mage.Sets/src/mage/cards/a/ArcMage.java index e6623bee5d7..033638e5212 100644 --- a/Mage.Sets/src/mage/cards/a/ArcMage.java +++ b/Mage.Sets/src/mage/cards/a/ArcMage.java @@ -38,6 +38,7 @@ import mage.abilities.effects.common.DamageMultiEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayerAmount; @@ -51,8 +52,8 @@ public class ArcMage extends CardImpl { public ArcMage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); - this.subtype.add("Human"); - this.subtype.add("Spellshaper"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SPELLSHAPER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/ArcRunner.java b/Mage.Sets/src/mage/cards/a/ArcRunner.java index e7528ad0172..d53be209eea 100644 --- a/Mage.Sets/src/mage/cards/a/ArcRunner.java +++ b/Mage.Sets/src/mage/cards/a/ArcRunner.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.game.events.GameEvent.EventType; import java.util.UUID; @@ -47,8 +48,8 @@ public class ArcRunner extends CardImpl { public ArcRunner(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); - this.subtype.add("Elemental"); - this.subtype.add("Ox"); + this.subtype.add(SubType.ELEMENTAL); + this.subtype.add(SubType.OX); this.power = new MageInt(5); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/ArcSlogger.java b/Mage.Sets/src/mage/cards/a/ArcSlogger.java index bd38a440b2f..698323ee788 100644 --- a/Mage.Sets/src/mage/cards/a/ArcSlogger.java +++ b/Mage.Sets/src/mage/cards/a/ArcSlogger.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; @@ -50,7 +51,7 @@ public class ArcSlogger extends CardImpl { public ArcSlogger(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}"); - this.subtype.add("Beast"); + this.subtype.add(SubType.BEAST); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java b/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java index 4a824bfb30d..2263712445c 100644 --- a/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java +++ b/Mage.Sets/src/mage/cards/a/ArcadesSabboth.java @@ -63,8 +63,8 @@ public class ArcadesSabboth extends CardImpl { public ArcadesSabboth(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{G}{W}{W}{U}{U}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Elder"); - this.subtype.add("Dragon"); + this.subtype.add(SubType.ELDER); + this.subtype.add(SubType.DRAGON); this.power = new MageInt(7); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/a/ArcaneTeachings.java b/Mage.Sets/src/mage/cards/a/ArcaneTeachings.java index d0d60ea55f4..c90cd61bfa7 100644 --- a/Mage.Sets/src/mage/cards/a/ArcaneTeachings.java +++ b/Mage.Sets/src/mage/cards/a/ArcaneTeachings.java @@ -53,7 +53,7 @@ public class ArcaneTeachings extends CardImpl { public ArcaneTeachings(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); diff --git a/Mage.Sets/src/mage/cards/a/ArcanisTheOmnipotent.java b/Mage.Sets/src/mage/cards/a/ArcanisTheOmnipotent.java index c1ec7d60491..c606f9c16ab 100644 --- a/Mage.Sets/src/mage/cards/a/ArcanisTheOmnipotent.java +++ b/Mage.Sets/src/mage/cards/a/ArcanisTheOmnipotent.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.ReturnToHandSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; @@ -50,7 +51,7 @@ public class ArcanisTheOmnipotent extends CardImpl { public ArcanisTheOmnipotent(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{U}{U}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Wizard"); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/ArcanumWings.java b/Mage.Sets/src/mage/cards/a/ArcanumWings.java index 9616536cc7a..4af9ddd244c 100644 --- a/Mage.Sets/src/mage/cards/a/ArcanumWings.java +++ b/Mage.Sets/src/mage/cards/a/ArcanumWings.java @@ -37,10 +37,7 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -54,7 +51,7 @@ public class ArcanumWings extends CardImpl { public ArcanumWings(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/cards/a/ArcboundBruiser.java b/Mage.Sets/src/mage/cards/a/ArcboundBruiser.java index 20029352fc7..db27bd8e28a 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundBruiser.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundBruiser.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.ModularAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,7 +44,7 @@ public class ArcboundBruiser extends CardImpl { public ArcboundBruiser(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{5}"); - this.subtype.add("Golem"); + this.subtype.add(SubType.GOLEM); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/a/ArcboundCrusher.java b/Mage.Sets/src/mage/cards/a/ArcboundCrusher.java index fe75c84ad66..6569a2280df 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundCrusher.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundCrusher.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactPermanent; @@ -56,7 +57,7 @@ public class ArcboundCrusher extends CardImpl { public ArcboundCrusher(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{4}"); - this.subtype.add("Juggernaut"); + this.subtype.add(SubType.JUGGERNAUT); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/a/ArcboundHybrid.java b/Mage.Sets/src/mage/cards/a/ArcboundHybrid.java index 89657ab0eb6..2127aeffcd9 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundHybrid.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundHybrid.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.ModularAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,7 +45,7 @@ public class ArcboundHybrid extends CardImpl { public ArcboundHybrid(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{4}"); - this.subtype.add("Beast"); + this.subtype.add(SubType.BEAST); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/a/ArcboundLancer.java b/Mage.Sets/src/mage/cards/a/ArcboundLancer.java index e9d5cf44238..2a36114326f 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundLancer.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundLancer.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.ModularAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,7 +45,7 @@ public class ArcboundLancer extends CardImpl { public ArcboundLancer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{7}"); - this.subtype.add("Beast"); + this.subtype.add(SubType.BEAST); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/a/ArcboundOverseer.java b/Mage.Sets/src/mage/cards/a/ArcboundOverseer.java index f2e650a5dba..fcedacc7062 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundOverseer.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundOverseer.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.ModularAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; @@ -56,7 +57,7 @@ public class ArcboundOverseer extends CardImpl { public ArcboundOverseer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{8}"); - this.subtype.add("Golem"); + this.subtype.add(SubType.GOLEM); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/a/ArcboundRavager.java b/Mage.Sets/src/mage/cards/a/ArcboundRavager.java index fdbdadeb13b..f44e1ec5177 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundRavager.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundRavager.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.ModularAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledPermanent; @@ -57,7 +58,7 @@ public class ArcboundRavager extends CardImpl { public ArcboundRavager(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{2}"); - this.subtype.add("Beast"); + this.subtype.add(SubType.BEAST); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/a/ArcboundReclaimer.java b/Mage.Sets/src/mage/cards/a/ArcboundReclaimer.java index 8f24c2ae189..62eb55a99e4 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundReclaimer.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundReclaimer.java @@ -36,6 +36,7 @@ import mage.abilities.keyword.ModularAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterArtifactCard; @@ -51,7 +52,7 @@ public class ArcboundReclaimer extends CardImpl { public ArcboundReclaimer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{4}"); - this.subtype.add("Golem"); + this.subtype.add(SubType.GOLEM); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/a/ArcboundSlith.java b/Mage.Sets/src/mage/cards/a/ArcboundSlith.java index e040ac16cb6..a0e387e72a7 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundSlith.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundSlith.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.ModularAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.counters.CounterType; import java.util.UUID; @@ -46,7 +47,7 @@ public class ArcboundSlith extends CardImpl { public ArcboundSlith(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{2}"); - this.subtype.add("Slith"); + this.subtype.add(SubType.SLITH); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/a/ArcboundStinger.java b/Mage.Sets/src/mage/cards/a/ArcboundStinger.java index 204bc8949a7..ffbc012cdeb 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundStinger.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundStinger.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.ModularAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,7 +45,7 @@ public class ArcboundStinger extends CardImpl { public ArcboundStinger(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{2}"); - this.subtype.add("Insect"); + this.subtype.add(SubType.INSECT); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/a/ArcboundWanderer.java b/Mage.Sets/src/mage/cards/a/ArcboundWanderer.java index 27b54f4889d..4ad2a058b99 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundWanderer.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundWanderer.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.ModularAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,7 +44,7 @@ public class ArcboundWanderer extends CardImpl { public ArcboundWanderer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{6}"); - this.subtype.add("Golem"); + this.subtype.add(SubType.GOLEM); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/a/ArcboundWorker.java b/Mage.Sets/src/mage/cards/a/ArcboundWorker.java index ff111ed1a13..a1bba3dfe91 100644 --- a/Mage.Sets/src/mage/cards/a/ArcboundWorker.java +++ b/Mage.Sets/src/mage/cards/a/ArcboundWorker.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.ModularAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,7 +44,7 @@ public class ArcboundWorker extends CardImpl { public ArcboundWorker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{1}"); - this.subtype.add("Construct"); + this.subtype.add(SubType.CONSTRUCT); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/a/Archaeomancer.java b/Mage.Sets/src/mage/cards/a/Archaeomancer.java index 97ccb7e0446..4312771a979 100644 --- a/Mage.Sets/src/mage/cards/a/Archaeomancer.java +++ b/Mage.Sets/src/mage/cards/a/Archaeomancer.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -57,8 +58,8 @@ public class Archaeomancer extends CardImpl { public Archaeomancer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/Archangel.java b/Mage.Sets/src/mage/cards/a/Archangel.java index 780e4de9e70..ce7ad6e4f18 100644 --- a/Mage.Sets/src/mage/cards/a/Archangel.java +++ b/Mage.Sets/src/mage/cards/a/Archangel.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,7 +45,7 @@ public class Archangel extends CardImpl { public Archangel(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/ArchangelAvacyn.java b/Mage.Sets/src/mage/cards/a/ArchangelAvacyn.java index ec1697841fe..f92fae2ac4a 100644 --- a/Mage.Sets/src/mage/cards/a/ArchangelAvacyn.java +++ b/Mage.Sets/src/mage/cards/a/ArchangelAvacyn.java @@ -69,7 +69,7 @@ public class ArchangelAvacyn extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/ArchangelOfStrife.java b/Mage.Sets/src/mage/cards/a/ArchangelOfStrife.java index 2c0c9355e6a..0871105e6fe 100644 --- a/Mage.Sets/src/mage/cards/a/ArchangelOfStrife.java +++ b/Mage.Sets/src/mage/cards/a/ArchangelOfStrife.java @@ -39,10 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.choices.Choice; import mage.choices.ChoiceImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -58,7 +55,7 @@ public class ArchangelOfStrife extends CardImpl { public ArchangelOfStrife(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/ArchangelOfThune.java b/Mage.Sets/src/mage/cards/a/ArchangelOfThune.java index 7665b639184..e0f98a820f6 100644 --- a/Mage.Sets/src/mage/cards/a/ArchangelOfThune.java +++ b/Mage.Sets/src/mage/cards/a/ArchangelOfThune.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; @@ -52,7 +53,7 @@ public class ArchangelOfThune extends CardImpl { public ArchangelOfThune(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/ArchangelOfTithes.java b/Mage.Sets/src/mage/cards/a/ArchangelOfTithes.java index a64ebeb1ed1..4dca1b94e6d 100644 --- a/Mage.Sets/src/mage/cards/a/ArchangelOfTithes.java +++ b/Mage.Sets/src/mage/cards/a/ArchangelOfTithes.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -52,7 +53,7 @@ public class ArchangelOfTithes extends CardImpl { public ArchangelOfTithes(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/ArchdemonOfGreed.java b/Mage.Sets/src/mage/cards/a/ArchdemonOfGreed.java index 4e1d1340abd..03273d8901c 100644 --- a/Mage.Sets/src/mage/cards/a/ArchdemonOfGreed.java +++ b/Mage.Sets/src/mage/cards/a/ArchdemonOfGreed.java @@ -65,7 +65,7 @@ public class ArchdemonOfGreed extends CardImpl { public ArchdemonOfGreed(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},""); - this.subtype.add("Demon"); + this.subtype.add(SubType.DEMON); this.color.setBlack(true); this.nightCard = true; diff --git a/Mage.Sets/src/mage/cards/a/ArchdemonOfUnx.java b/Mage.Sets/src/mage/cards/a/ArchdemonOfUnx.java index e814c533a90..3f7b8f1a2fc 100644 --- a/Mage.Sets/src/mage/cards/a/ArchdemonOfUnx.java +++ b/Mage.Sets/src/mage/cards/a/ArchdemonOfUnx.java @@ -60,7 +60,7 @@ public class ArchdemonOfUnx extends CardImpl { public ArchdemonOfUnx(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{B}{B}"); - this.subtype.add("Demon"); + this.subtype.add(SubType.DEMON); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/ArchersOfQarsi.java b/Mage.Sets/src/mage/cards/a/ArchersOfQarsi.java index fe107a2af5e..16c1ee8b036 100644 --- a/Mage.Sets/src/mage/cards/a/ArchersOfQarsi.java +++ b/Mage.Sets/src/mage/cards/a/ArchersOfQarsi.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,8 +45,8 @@ public class ArchersOfQarsi extends CardImpl { public ArchersOfQarsi(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); - this.subtype.add("Naga"); - this.subtype.add("Archer"); + this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.ARCHER); this.power = new MageInt(5); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/ArchersParapet.java b/Mage.Sets/src/mage/cards/a/ArchersParapet.java index 1d5a90c762c..729a002ae05 100644 --- a/Mage.Sets/src/mage/cards/a/ArchersParapet.java +++ b/Mage.Sets/src/mage/cards/a/ArchersParapet.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -49,7 +50,7 @@ public class ArchersParapet extends CardImpl { public ArchersParapet(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); - this.subtype.add("Wall"); + this.subtype.add(SubType.WALL); this.power = new MageInt(0); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/ArchetypeOfAggression.java b/Mage.Sets/src/mage/cards/a/ArchetypeOfAggression.java index 00d9d991199..9ab978fd10a 100644 --- a/Mage.Sets/src/mage/cards/a/ArchetypeOfAggression.java +++ b/Mage.Sets/src/mage/cards/a/ArchetypeOfAggression.java @@ -34,10 +34,7 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; 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.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -58,8 +55,8 @@ public class ArchetypeOfAggression extends CardImpl { public ArchetypeOfAggression(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.CREATURE},"{1}{R}{R}"); - this.subtype.add("Human"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/ArchetypeOfCourage.java b/Mage.Sets/src/mage/cards/a/ArchetypeOfCourage.java index 3129a1fc827..b847034b31a 100644 --- a/Mage.Sets/src/mage/cards/a/ArchetypeOfCourage.java +++ b/Mage.Sets/src/mage/cards/a/ArchetypeOfCourage.java @@ -34,10 +34,7 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.FirstStrikeAbility; 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.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -57,8 +54,8 @@ public class ArchetypeOfCourage extends CardImpl { public ArchetypeOfCourage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.CREATURE},"{1}{W}{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/ArchetypeOfEndurance.java b/Mage.Sets/src/mage/cards/a/ArchetypeOfEndurance.java index 8ea45676b87..05868153ce4 100644 --- a/Mage.Sets/src/mage/cards/a/ArchetypeOfEndurance.java +++ b/Mage.Sets/src/mage/cards/a/ArchetypeOfEndurance.java @@ -34,10 +34,7 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.HexproofAbility; 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.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -58,7 +55,7 @@ public class ArchetypeOfEndurance extends CardImpl { public ArchetypeOfEndurance(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.CREATURE},"{6}{G}{G}"); - this.subtype.add("Boar"); + this.subtype.add(SubType.BOAR); this.power = new MageInt(6); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/ArchetypeOfFinality.java b/Mage.Sets/src/mage/cards/a/ArchetypeOfFinality.java index a43b7dc44bc..66b8b5cb271 100644 --- a/Mage.Sets/src/mage/cards/a/ArchetypeOfFinality.java +++ b/Mage.Sets/src/mage/cards/a/ArchetypeOfFinality.java @@ -34,10 +34,7 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.DeathtouchAbility; 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.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -58,7 +55,7 @@ public class ArchetypeOfFinality extends CardImpl { public ArchetypeOfFinality(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.CREATURE},"{4}{B}{B}"); - this.subtype.add("Gorgon"); + this.subtype.add(SubType.GORGON); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/ArchetypeOfImagination.java b/Mage.Sets/src/mage/cards/a/ArchetypeOfImagination.java index 9620c7a3231..9217c5599bd 100644 --- a/Mage.Sets/src/mage/cards/a/ArchetypeOfImagination.java +++ b/Mage.Sets/src/mage/cards/a/ArchetypeOfImagination.java @@ -34,10 +34,7 @@ import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.StaticFilters; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -57,8 +54,8 @@ public class ArchetypeOfImagination extends CardImpl { public ArchetypeOfImagination(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.CREATURE},"{4}{U}{U}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/ArchfiendOfDepravity.java b/Mage.Sets/src/mage/cards/a/ArchfiendOfDepravity.java index 2189f6d0ea6..13b4c8118d0 100644 --- a/Mage.Sets/src/mage/cards/a/ArchfiendOfDepravity.java +++ b/Mage.Sets/src/mage/cards/a/ArchfiendOfDepravity.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; @@ -55,7 +56,7 @@ public class ArchfiendOfDepravity extends CardImpl { public ArchfiendOfDepravity(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}"); - this.subtype.add("Demon"); + this.subtype.add(SubType.DEMON); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/ArchfiendOfIfnir.java b/Mage.Sets/src/mage/cards/a/ArchfiendOfIfnir.java index 51f696afa43..be8e76558aa 100644 --- a/Mage.Sets/src/mage/cards/a/ArchfiendOfIfnir.java +++ b/Mage.Sets/src/mage/cards/a/ArchfiendOfIfnir.java @@ -27,19 +27,21 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.CycleOrDiscardControllerTriggeredAbility; -import mage.abilities.keyword.FlyingAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.counter.AddCountersAllEffect; import mage.abilities.keyword.CyclingAbility; +import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterOpponentsCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -49,7 +51,7 @@ public class ArchfiendOfIfnir extends CardImpl { public ArchfiendOfIfnir(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}{B}"); - this.subtype.add("Demon"); + this.subtype.add(SubType.DEMON); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/ArchitectOfTheUntamed.java b/Mage.Sets/src/mage/cards/a/ArchitectOfTheUntamed.java index 1115c656ef1..f30738a886c 100644 --- a/Mage.Sets/src/mage/cards/a/ArchitectOfTheUntamed.java +++ b/Mage.Sets/src/mage/cards/a/ArchitectOfTheUntamed.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; @@ -37,10 +36,13 @@ import mage.abilities.effects.common.counter.GetEnergyCountersControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.game.permanent.token.ArchitectOfTheUntamedBeastToken; +import java.util.UUID; + /** * * @author LevelX2 @@ -49,9 +51,9 @@ public class ArchitectOfTheUntamed extends CardImpl { public ArchitectOfTheUntamed(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}"); - this.subtype.add("Elf"); - this.subtype.add("Artificer"); - this.subtype.add("Druid"); + this.subtype.add(SubType.ELF); + this.subtype.add(SubType.ARTIFICER); + this.subtype.add(SubType.DRUID); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/ArchitectsOfWill.java b/Mage.Sets/src/mage/cards/a/ArchitectsOfWill.java index bffeaf89ba0..cb050887588 100644 --- a/Mage.Sets/src/mage/cards/a/ArchitectsOfWill.java +++ b/Mage.Sets/src/mage/cards/a/ArchitectsOfWill.java @@ -36,6 +36,7 @@ import mage.abilities.keyword.CyclingAbility; import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.game.Game; import mage.players.Player; import mage.target.TargetPlayer; @@ -50,8 +51,8 @@ public class ArchitectsOfWill extends CardImpl { public ArchitectsOfWill(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{2}{U}{B}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/ArchiveTrap.java b/Mage.Sets/src/mage/cards/a/ArchiveTrap.java index 41d8a03f1be..b4971e1c2c5 100644 --- a/Mage.Sets/src/mage/cards/a/ArchiveTrap.java +++ b/Mage.Sets/src/mage/cards/a/ArchiveTrap.java @@ -35,6 +35,7 @@ import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; @@ -55,7 +56,7 @@ public class ArchiveTrap extends CardImpl { public ArchiveTrap(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{U}{U}"); - this.subtype.add("Trap"); + this.subtype.add(SubType.TRAP); // If an opponent searched his or her library this turn, you may pay {0} rather than pay Archive Trap's mana cost. this.addAbility(new AlternativeCostSourceAbility(new GenericManaCost(0), OpponentSearchesLibCondition.instance), new ArchiveTrapWatcher()); diff --git a/Mage.Sets/src/mage/cards/a/Archivist.java b/Mage.Sets/src/mage/cards/a/Archivist.java index 4e262df9a55..4b0417a6077 100644 --- a/Mage.Sets/src/mage/cards/a/Archivist.java +++ b/Mage.Sets/src/mage/cards/a/Archivist.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -46,8 +47,8 @@ public class Archivist extends CardImpl { public Archivist(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/ArchonOfJustice.java b/Mage.Sets/src/mage/cards/a/ArchonOfJustice.java index 0efd96ae325..af71e5d8056 100644 --- a/Mage.Sets/src/mage/cards/a/ArchonOfJustice.java +++ b/Mage.Sets/src/mage/cards/a/ArchonOfJustice.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.target.TargetPermanent; import java.util.UUID; @@ -47,7 +48,7 @@ public class ArchonOfJustice extends CardImpl { public ArchonOfJustice(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}"); - this.subtype.add("Archon"); + this.subtype.add(SubType.ARCHON); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/ArchonOfRedemption.java b/Mage.Sets/src/mage/cards/a/ArchonOfRedemption.java index a8254d3fb99..a51c7570d65 100644 --- a/Mage.Sets/src/mage/cards/a/ArchonOfRedemption.java +++ b/Mage.Sets/src/mage/cards/a/ArchonOfRedemption.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -54,7 +55,7 @@ public class ArchonOfRedemption extends CardImpl { public ArchonOfRedemption(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}"); - this.subtype.add("Archon"); + this.subtype.add(SubType.ARCHON); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/ArchonOfTheTriumvirate.java b/Mage.Sets/src/mage/cards/a/ArchonOfTheTriumvirate.java index 084173f2992..ddd284997ee 100644 --- a/Mage.Sets/src/mage/cards/a/ArchonOfTheTriumvirate.java +++ b/Mage.Sets/src/mage/cards/a/ArchonOfTheTriumvirate.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterNonlandPermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -56,7 +57,7 @@ public class ArchonOfTheTriumvirate extends CardImpl { public ArchonOfTheTriumvirate(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}{U}"); - this.subtype.add("Archon"); + this.subtype.add(SubType.ARCHON); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/Archweaver.java b/Mage.Sets/src/mage/cards/a/Archweaver.java index 2d8e23335ac..bfbd75f0d49 100644 --- a/Mage.Sets/src/mage/cards/a/Archweaver.java +++ b/Mage.Sets/src/mage/cards/a/Archweaver.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,7 +45,7 @@ public class Archweaver extends CardImpl { public Archweaver(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{G}{G}"); - this.subtype.add("Spider"); + this.subtype.add(SubType.SPIDER); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/ArchwingDragon.java b/Mage.Sets/src/mage/cards/a/ArchwingDragon.java index 2903ca6a7e9..f41f690b919 100644 --- a/Mage.Sets/src/mage/cards/a/ArchwingDragon.java +++ b/Mage.Sets/src/mage/cards/a/ArchwingDragon.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.game.events.GameEvent; import java.util.UUID; @@ -47,7 +48,7 @@ public class ArchwingDragon extends CardImpl { public ArchwingDragon(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); - this.subtype.add("Dragon"); + this.subtype.add(SubType.DRAGON); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/ArcticAven.java b/Mage.Sets/src/mage/cards/a/ArcticAven.java index 9a47e298d7f..59c04e5b727 100644 --- a/Mage.Sets/src/mage/cards/a/ArcticAven.java +++ b/Mage.Sets/src/mage/cards/a/ArcticAven.java @@ -60,8 +60,8 @@ public class ArcticAven extends CardImpl { public ArcticAven(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}"); - this.subtype.add("Bird"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/ArcticMerfolk.java b/Mage.Sets/src/mage/cards/a/ArcticMerfolk.java index 8913146ae57..2d1667b1a23 100644 --- a/Mage.Sets/src/mage/cards/a/ArcticMerfolk.java +++ b/Mage.Sets/src/mage/cards/a/ArcticMerfolk.java @@ -36,6 +36,7 @@ import mage.abilities.keyword.KickerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent; @@ -50,7 +51,7 @@ public class ArcticMerfolk extends CardImpl { public ArcticMerfolk(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); - this.subtype.add("Merfolk"); + this.subtype.add(SubType.MERFOLK); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/ArcticWolves.java b/Mage.Sets/src/mage/cards/a/ArcticWolves.java index a183301c9af..e36f29dbb32 100644 --- a/Mage.Sets/src/mage/cards/a/ArcticWolves.java +++ b/Mage.Sets/src/mage/cards/a/ArcticWolves.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.CumulativeUpkeepAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -46,7 +47,7 @@ public class ArcticWolves extends CardImpl { public ArcticWolves(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}"); - this.subtype.add("Wolf"); + this.subtype.add(SubType.WOLF); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/ArcumDagsson.java b/Mage.Sets/src/mage/cards/a/ArcumDagsson.java index 10d3e864b8d..e280ed73068 100644 --- a/Mage.Sets/src/mage/cards/a/ArcumDagsson.java +++ b/Mage.Sets/src/mage/cards/a/ArcumDagsson.java @@ -35,10 +35,7 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactCard; @@ -68,8 +65,8 @@ public class ArcumDagsson extends CardImpl { public ArcumDagsson(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Human"); - this.subtype.add("Artificer"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.ARTIFICER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/ArdentMilitia.java b/Mage.Sets/src/mage/cards/a/ArdentMilitia.java index 87abb2ce48d..01183692c40 100644 --- a/Mage.Sets/src/mage/cards/a/ArdentMilitia.java +++ b/Mage.Sets/src/mage/cards/a/ArdentMilitia.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,8 +44,8 @@ public class ArdentMilitia extends CardImpl { public ArdentMilitia(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/ArdentRecruit.java b/Mage.Sets/src/mage/cards/a/ArdentRecruit.java index 3a52cebc731..ca8e3e923d7 100644 --- a/Mage.Sets/src/mage/cards/a/ArdentRecruit.java +++ b/Mage.Sets/src/mage/cards/a/ArdentRecruit.java @@ -37,10 +37,7 @@ import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AbilityWord; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; +import mage.constants.*; import java.util.UUID; @@ -51,8 +48,8 @@ public class ArdentRecruit extends CardImpl { public ArdentRecruit(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/ArdentSoldier.java b/Mage.Sets/src/mage/cards/a/ArdentSoldier.java index 22b56a34d58..35323675b37 100644 --- a/Mage.Sets/src/mage/cards/a/ArdentSoldier.java +++ b/Mage.Sets/src/mage/cards/a/ArdentSoldier.java @@ -36,6 +36,7 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.counters.CounterType; import java.util.UUID; @@ -49,8 +50,8 @@ public class ArdentSoldier extends CardImpl { public ArdentSoldier(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/ArenaAthlete.java b/Mage.Sets/src/mage/cards/a/ArenaAthlete.java index d76929c59ff..35587724b76 100644 --- a/Mage.Sets/src/mage/cards/a/ArenaAthlete.java +++ b/Mage.Sets/src/mage/cards/a/ArenaAthlete.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -56,7 +57,7 @@ public class ArenaAthlete extends CardImpl { public ArenaAthlete(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}"); - this.subtype.add("Human"); + this.subtype.add(SubType.HUMAN); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/ArgentSphinx.java b/Mage.Sets/src/mage/cards/a/ArgentSphinx.java index ea111f1cd67..99c30194c05 100644 --- a/Mage.Sets/src/mage/cards/a/ArgentSphinx.java +++ b/Mage.Sets/src/mage/cards/a/ArgentSphinx.java @@ -40,10 +40,7 @@ import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlTargetEf import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AbilityWord; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; @@ -58,7 +55,7 @@ public class ArgentSphinx extends CardImpl { public ArgentSphinx(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}{U}"); - this.subtype.add("Sphinx"); + this.subtype.add(SubType.SPHINX); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/ArgentumArmor.java b/Mage.Sets/src/mage/cards/a/ArgentumArmor.java index ecdff5822c4..68ebfc4dbdc 100644 --- a/Mage.Sets/src/mage/cards/a/ArgentumArmor.java +++ b/Mage.Sets/src/mage/cards/a/ArgentumArmor.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.TargetPermanent; @@ -51,7 +52,7 @@ public class ArgentumArmor extends CardImpl { public ArgentumArmor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}"); - this.subtype.add("Equipment"); + this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +6/+6. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(6, 6))); diff --git a/Mage.Sets/src/mage/cards/a/ArgivianArchaeologist.java b/Mage.Sets/src/mage/cards/a/ArgivianArchaeologist.java index b9d4b060147..542e27fab14 100644 --- a/Mage.Sets/src/mage/cards/a/ArgivianArchaeologist.java +++ b/Mage.Sets/src/mage/cards/a/ArgivianArchaeologist.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterArtifactCard; import mage.target.Target; @@ -53,8 +54,8 @@ public class ArgivianArchaeologist extends CardImpl { public ArgivianArchaeologist(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}"); - this.subtype.add("Human"); - this.subtype.add("Artificer"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.ARTIFICER); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/ArgivianBlacksmith.java b/Mage.Sets/src/mage/cards/a/ArgivianBlacksmith.java index 3e501354404..b9a597e69cc 100644 --- a/Mage.Sets/src/mage/cards/a/ArgivianBlacksmith.java +++ b/Mage.Sets/src/mage/cards/a/ArgivianBlacksmith.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -58,8 +59,8 @@ public class ArgivianBlacksmith extends CardImpl { public ArgivianBlacksmith(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}"); - this.subtype.add("Human"); - this.subtype.add("Artificer"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.ARTIFICER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/ArgothianElder.java b/Mage.Sets/src/mage/cards/a/ArgothianElder.java index 36e09e7228a..7f1889682de 100644 --- a/Mage.Sets/src/mage/cards/a/ArgothianElder.java +++ b/Mage.Sets/src/mage/cards/a/ArgothianElder.java @@ -37,6 +37,7 @@ import mage.abilities.effects.common.UntapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetLandPermanent; @@ -50,8 +51,8 @@ public class ArgothianElder extends CardImpl { public ArgothianElder(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); - this.subtype.add("Elf"); - this.subtype.add("Druid"); + this.subtype.add(SubType.ELF); + this.subtype.add(SubType.DRUID); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/ArgothianEnchantress.java b/Mage.Sets/src/mage/cards/a/ArgothianEnchantress.java index 9d9ff416bec..0326e0d5c6e 100644 --- a/Mage.Sets/src/mage/cards/a/ArgothianEnchantress.java +++ b/Mage.Sets/src/mage/cards/a/ArgothianEnchantress.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -53,8 +54,8 @@ public class ArgothianEnchantress extends CardImpl { public ArgothianEnchantress(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); - this.subtype.add("Human"); - this.subtype.add("Druid"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.DRUID); this.power = new MageInt(0); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/ArgothianPixies.java b/Mage.Sets/src/mage/cards/a/ArgothianPixies.java index 9e79a630fe8..87fc7522531 100644 --- a/Mage.Sets/src/mage/cards/a/ArgothianPixies.java +++ b/Mage.Sets/src/mage/cards/a/ArgothianPixies.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -59,7 +60,7 @@ public class ArgothianPixies extends CardImpl { public ArgothianPixies(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}"); - this.subtype.add("Faerie"); + this.subtype.add(SubType.FAERIE); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/ArgothianSwine.java b/Mage.Sets/src/mage/cards/a/ArgothianSwine.java index cc00b887048..70f93d52284 100644 --- a/Mage.Sets/src/mage/cards/a/ArgothianSwine.java +++ b/Mage.Sets/src/mage/cards/a/ArgothianSwine.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,7 +45,7 @@ public class ArgothianSwine extends CardImpl { public ArgothianSwine (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); - this.subtype.add("Boar"); + this.subtype.add(SubType.BOAR); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/ArgothianTreefolk.java b/Mage.Sets/src/mage/cards/a/ArgothianTreefolk.java index 16d08609fb2..3953a5be100 100644 --- a/Mage.Sets/src/mage/cards/a/ArgothianTreefolk.java +++ b/Mage.Sets/src/mage/cards/a/ArgothianTreefolk.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -49,7 +50,7 @@ public class ArgothianTreefolk extends CardImpl { public ArgothianTreefolk(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}"); - this.subtype.add("Treefolk"); + this.subtype.add(SubType.TREEFOLK); this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/ArgothianWurm.java b/Mage.Sets/src/mage/cards/a/ArgothianWurm.java index ea1d3e38217..a42634f28b2 100644 --- a/Mage.Sets/src/mage/cards/a/ArgothianWurm.java +++ b/Mage.Sets/src/mage/cards/a/ArgothianWurm.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.filter.common.FilterControlledLandPermanent; import mage.game.Game; import mage.players.Player; @@ -53,7 +54,7 @@ public class ArgothianWurm extends CardImpl { public ArgothianWurm(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); - this.subtype.add("Wurm"); + this.subtype.add(SubType.WURM); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/ArjunTheShiftingFlame.java b/Mage.Sets/src/mage/cards/a/ArjunTheShiftingFlame.java index 0e3fea72e3e..46d3aa1359b 100644 --- a/Mage.Sets/src/mage/cards/a/ArjunTheShiftingFlame.java +++ b/Mage.Sets/src/mage/cards/a/ArjunTheShiftingFlame.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.SuperType; import mage.game.Game; import mage.players.Player; @@ -51,8 +52,8 @@ public class ArjunTheShiftingFlame extends CardImpl { public ArjunTheShiftingFlame(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}{R}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Sphinx"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.SPHINX); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/ArlinnEmbracedByTheMoon.java b/Mage.Sets/src/mage/cards/a/ArlinnEmbracedByTheMoon.java index b53e662212c..66d1ed76a0b 100644 --- a/Mage.Sets/src/mage/cards/a/ArlinnEmbracedByTheMoon.java +++ b/Mage.Sets/src/mage/cards/a/ArlinnEmbracedByTheMoon.java @@ -40,10 +40,11 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; +import mage.game.command.emblems.ArlinnEmbracedByTheMoonEmblem; import mage.target.common.TargetCreatureOrPlayer; -import mage.game.command.emblems.ArlinnEmbracedByTheMoonEmblem; import java.util.UUID; /** @@ -56,7 +57,7 @@ public class ArlinnEmbracedByTheMoon extends CardImpl { public ArlinnEmbracedByTheMoon(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, ""); - this.subtype.add("Arlinn"); + this.subtype.add(SubType.ARLINN); this.color.setRed(true); this.color.setGreen(true); diff --git a/Mage.Sets/src/mage/cards/a/ArlinnKord.java b/Mage.Sets/src/mage/cards/a/ArlinnKord.java index 8e3b142dd27..d98d5d4f7cf 100644 --- a/Mage.Sets/src/mage/cards/a/ArlinnKord.java +++ b/Mage.Sets/src/mage/cards/a/ArlinnKord.java @@ -41,6 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.game.permanent.token.WolfToken; import mage.target.common.TargetCreaturePermanent; @@ -54,7 +55,7 @@ public class ArlinnKord extends CardImpl { public ArlinnKord(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.PLANESWALKER},"{2}{R}{G}"); - this.subtype.add("Arlinn"); + this.subtype.add(SubType.ARLINN); this.transformable = true; this.secondSideCardClazz = ArlinnEmbracedByTheMoon.class; diff --git a/Mage.Sets/src/mage/cards/a/ArmadaWurm.java b/Mage.Sets/src/mage/cards/a/ArmadaWurm.java index 544a9402c2d..53e5dee048a 100644 --- a/Mage.Sets/src/mage/cards/a/ArmadaWurm.java +++ b/Mage.Sets/src/mage/cards/a/ArmadaWurm.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.game.permanent.token.WurmToken2; import java.util.UUID; @@ -46,7 +47,7 @@ public class ArmadaWurm extends CardImpl { public ArmadaWurm(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{G}{W}{W}"); - this.subtype.add("Wurm"); + this.subtype.add(SubType.WURM); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/ArmadilloCloak.java b/Mage.Sets/src/mage/cards/a/ArmadilloCloak.java index 423b4fb8f3c..79d9465c014 100644 --- a/Mage.Sets/src/mage/cards/a/ArmadilloCloak.java +++ b/Mage.Sets/src/mage/cards/a/ArmadilloCloak.java @@ -54,7 +54,7 @@ public class ArmadilloCloak extends CardImpl { public ArmadilloCloak(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{G}{W}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/cards/a/ArmamentCorps.java b/Mage.Sets/src/mage/cards/a/ArmamentCorps.java index ee157350a70..081659e4508 100644 --- a/Mage.Sets/src/mage/cards/a/ArmamentCorps.java +++ b/Mage.Sets/src/mage/cards/a/ArmamentCorps.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.counter.DistributeCountersEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; @@ -56,8 +57,8 @@ public class ArmamentCorps extends CardImpl { public ArmamentCorps(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{B}{G}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/ArmamentMaster.java b/Mage.Sets/src/mage/cards/a/ArmamentMaster.java index e47445b2afa..39396c72737 100644 --- a/Mage.Sets/src/mage/cards/a/ArmamentMaster.java +++ b/Mage.Sets/src/mage/cards/a/ArmamentMaster.java @@ -56,8 +56,8 @@ public class ArmamentMaster extends CardImpl { public ArmamentMaster(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}"); - this.subtype.add("Kor"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.KOR); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/ArmamentOfNyx.java b/Mage.Sets/src/mage/cards/a/ArmamentOfNyx.java index 7ef7f0c9fd6..e56d346c7e8 100644 --- a/Mage.Sets/src/mage/cards/a/ArmamentOfNyx.java +++ b/Mage.Sets/src/mage/cards/a/ArmamentOfNyx.java @@ -64,7 +64,7 @@ public class ArmamentOfNyx extends CardImpl { public ArmamentOfNyx(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature diff --git a/Mage.Sets/src/mage/cards/a/ArmedProtocolDroid.java b/Mage.Sets/src/mage/cards/a/ArmedProtocolDroid.java index 8c2fab1e0bc..e7a012680ec 100644 --- a/Mage.Sets/src/mage/cards/a/ArmedProtocolDroid.java +++ b/Mage.Sets/src/mage/cards/a/ArmedProtocolDroid.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -57,8 +58,8 @@ public class ArmedProtocolDroid extends CardImpl { public ArmedProtocolDroid(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{1}{U}"); - this.subtype.add("Droid"); - this.subtype.add("Rogue"); + this.subtype.add(SubType.DROID); + this.subtype.add(SubType.ROGUE); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/ArmorOfFaith.java b/Mage.Sets/src/mage/cards/a/ArmorOfFaith.java index 0326ff22bfa..f637fe2f101 100644 --- a/Mage.Sets/src/mage/cards/a/ArmorOfFaith.java +++ b/Mage.Sets/src/mage/cards/a/ArmorOfFaith.java @@ -36,10 +36,7 @@ import mage.abilities.effects.common.continuous.BoostEnchantedEffect; import mage.abilities.keyword.EnchantAbility; 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.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -53,7 +50,7 @@ public class ArmorOfFaith extends CardImpl { public ArmorOfFaith(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{W}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/cards/a/ArmorOfThorns.java b/Mage.Sets/src/mage/cards/a/ArmorOfThorns.java index 8e4155ea881..f9075d7dc4f 100644 --- a/Mage.Sets/src/mage/cards/a/ArmorOfThorns.java +++ b/Mage.Sets/src/mage/cards/a/ArmorOfThorns.java @@ -37,10 +37,7 @@ import mage.abilities.effects.common.continuous.CastAsThoughItHadFlashSourceEffe import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; @@ -63,7 +60,7 @@ public class ArmorOfThorns extends CardImpl { public ArmorOfThorns(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{G}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // You may cast Armor of Thorns as though it had flash. If you cast it any time a sorcery couldn't have been cast, the controller of the permanent it becomes sacrifices it at the beginning of the next cleanup step. this.addAbility(new SimpleStaticAbility(Zone.ALL, new CastAsThoughItHadFlashSourceEffect(Duration.EndOfGame))); diff --git a/Mage.Sets/src/mage/cards/a/ArmorSliver.java b/Mage.Sets/src/mage/cards/a/ArmorSliver.java index 7bf8d5a54a3..8c70a40a69d 100644 --- a/Mage.Sets/src/mage/cards/a/ArmorSliver.java +++ b/Mage.Sets/src/mage/cards/a/ArmorSliver.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.StaticFilters; @@ -50,7 +51,7 @@ public class ArmorSliver extends CardImpl { public ArmorSliver(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}"); - this.subtype.add("Sliver"); + this.subtype.add(SubType.SLIVER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/ArmorThrull.java b/Mage.Sets/src/mage/cards/a/ArmorThrull.java index dc489d149e6..9a380d5bd5c 100644 --- a/Mage.Sets/src/mage/cards/a/ArmorThrull.java +++ b/Mage.Sets/src/mage/cards/a/ArmorThrull.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; @@ -50,7 +51,7 @@ public class ArmorThrull extends CardImpl { public ArmorThrull(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}"); - this.subtype.add("Thrull"); + this.subtype.add(SubType.THRULL); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/ArmorcraftJudge.java b/Mage.Sets/src/mage/cards/a/ArmorcraftJudge.java index a5ea58cdfff..d6955829dad 100644 --- a/Mage.Sets/src/mage/cards/a/ArmorcraftJudge.java +++ b/Mage.Sets/src/mage/cards/a/ArmorcraftJudge.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.CounterPredicate; @@ -54,8 +55,8 @@ public class ArmorcraftJudge extends CardImpl { public ArmorcraftJudge(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); - this.subtype.add("Elf"); - this.subtype.add("Artificer"); + this.subtype.add(SubType.ELF); + this.subtype.add(SubType.ARTIFICER); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/ArmoredAscension.java b/Mage.Sets/src/mage/cards/a/ArmoredAscension.java index 5558bccf454..52dc73fd023 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredAscension.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredAscension.java @@ -61,7 +61,7 @@ public class ArmoredAscension extends CardImpl { public ArmoredAscension(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{W}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); diff --git a/Mage.Sets/src/mage/cards/a/ArmoredCancrix.java b/Mage.Sets/src/mage/cards/a/ArmoredCancrix.java index a32a85050a8..18efc02c8f1 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredCancrix.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredCancrix.java @@ -32,6 +32,7 @@ import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,7 +45,7 @@ public class ArmoredCancrix extends CardImpl { public ArmoredCancrix(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}"); - this.subtype.add("Crab"); + this.subtype.add(SubType.CRAB); this.power = new MageInt(2); this.toughness = new MageInt(5); } diff --git a/Mage.Sets/src/mage/cards/a/ArmoredGalleon.java b/Mage.Sets/src/mage/cards/a/ArmoredGalleon.java index 85e72ba0cb4..3af820d3f66 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredGalleon.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredGalleon.java @@ -47,8 +47,8 @@ public class ArmoredGalleon extends CardImpl { public ArmoredGalleon(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{U}"); - this.subtype.add("Human"); - this.subtype.add("Pirate"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.PIRATE); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/ArmoredGriffin.java b/Mage.Sets/src/mage/cards/a/ArmoredGriffin.java index 3737363e2c8..86cf4f8abfd 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredGriffin.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredGriffin.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,7 +45,7 @@ public class ArmoredGriffin extends CardImpl { public ArmoredGriffin(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add("Griffin"); + this.subtype.add(SubType.GRIFFIN); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/ArmoredGuardian.java b/Mage.Sets/src/mage/cards/a/ArmoredGuardian.java index 2f91dc45ad2..b1fdb301615 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredGuardian.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredGuardian.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetControlledCreaturePermanent; @@ -52,8 +53,8 @@ public class ArmoredGuardian extends CardImpl { public ArmoredGuardian(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{U}"); - this.subtype.add("Cat"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.CAT); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/ArmoredPegasus.java b/Mage.Sets/src/mage/cards/a/ArmoredPegasus.java index 3cfb342e5e7..0bfd5919e17 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredPegasus.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredPegasus.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,7 +44,7 @@ public class ArmoredPegasus extends CardImpl { public ArmoredPegasus(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Pegasus"); + this.subtype.add(SubType.PEGASUS); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/ArmoredSkaab.java b/Mage.Sets/src/mage/cards/a/ArmoredSkaab.java index d063469dddc..ce597e45e72 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredSkaab.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredSkaab.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.PutTopCardOfLibraryIntoGraveControllerEffec import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,8 +45,8 @@ public class ArmoredSkaab extends CardImpl { public ArmoredSkaab(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}"); - this.subtype.add("Zombie"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.ZOMBIE); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/ArmoredTransport.java b/Mage.Sets/src/mage/cards/a/ArmoredTransport.java index fc9122c7e64..4175ca670c0 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredTransport.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredTransport.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.DamageEvent; @@ -51,7 +52,7 @@ public class ArmoredTransport extends CardImpl { public ArmoredTransport(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{3}"); - this.subtype.add("Construct"); + this.subtype.add(SubType.CONSTRUCT); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/ArmoredWarhorse.java b/Mage.Sets/src/mage/cards/a/ArmoredWarhorse.java index 22838750964..18ca98a2e5b 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredWarhorse.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredWarhorse.java @@ -32,6 +32,7 @@ import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -42,7 +43,7 @@ public class ArmoredWarhorse extends CardImpl { public ArmoredWarhorse(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}"); - this.subtype.add("Horse"); + this.subtype.add(SubType.HORSE); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/ArmoredWolfRider.java b/Mage.Sets/src/mage/cards/a/ArmoredWolfRider.java index fa1d84a881a..0ded6422414 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredWolfRider.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredWolfRider.java @@ -32,6 +32,7 @@ import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,8 +46,8 @@ public class ArmoredWolfRider extends CardImpl { public ArmoredWolfRider (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{W}"); - this.subtype.add("Elf"); - this.subtype.add("Knight"); + this.subtype.add(SubType.ELF); + this.subtype.add(SubType.KNIGHT); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/ArmorerGuildmage.java b/Mage.Sets/src/mage/cards/a/ArmorerGuildmage.java index c02fb166697..a6666c48a67 100644 --- a/Mage.Sets/src/mage/cards/a/ArmorerGuildmage.java +++ b/Mage.Sets/src/mage/cards/a/ArmorerGuildmage.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; @@ -50,8 +51,8 @@ public class ArmorerGuildmage extends CardImpl { public ArmorerGuildmage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/ArmoryAutomaton.java b/Mage.Sets/src/mage/cards/a/ArmoryAutomaton.java index f3d57297a50..5471e158c5f 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoryAutomaton.java +++ b/Mage.Sets/src/mage/cards/a/ArmoryAutomaton.java @@ -55,7 +55,7 @@ public class ArmoryAutomaton extends CardImpl { public ArmoryAutomaton(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{3}"); - this.subtype.add("Construct"); + this.subtype.add(SubType.CONSTRUCT); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/ArmoryGuard.java b/Mage.Sets/src/mage/cards/a/ArmoryGuard.java index f5db6983c5c..66592b6ac01 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoryGuard.java +++ b/Mage.Sets/src/mage/cards/a/ArmoryGuard.java @@ -59,8 +59,8 @@ public class ArmoryGuard extends CardImpl { public ArmoryGuard(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add("Giant"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.GIANT); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/ArmoryOfIroas.java b/Mage.Sets/src/mage/cards/a/ArmoryOfIroas.java index a061f6b91d5..0d7077b9a01 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoryOfIroas.java +++ b/Mage.Sets/src/mage/cards/a/ArmoryOfIroas.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.counters.CounterType; import java.util.UUID; @@ -47,7 +48,7 @@ public class ArmoryOfIroas extends CardImpl { public ArmoryOfIroas(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}"); - this.subtype.add("Equipment"); + this.subtype.add(SubType.EQUIPMENT); // Whenever equipped creature attacks, put a +1/+1 counter on it. this.addAbility(new AttacksAttachedTriggeredAbility(new AddCountersAttachedEffect(CounterType.P1P1.createInstance(), "it"))); diff --git a/Mage.Sets/src/mage/cards/a/ArmsDealer.java b/Mage.Sets/src/mage/cards/a/ArmsDealer.java index 7ba7f9c1f0f..3f2500be436 100644 --- a/Mage.Sets/src/mage/cards/a/ArmsDealer.java +++ b/Mage.Sets/src/mage/cards/a/ArmsDealer.java @@ -58,8 +58,8 @@ public class ArmsDealer extends CardImpl { public ArmsDealer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); - this.subtype.add("Goblin"); - this.subtype.add("Rogue"); + this.subtype.add(SubType.GOBLIN); + this.subtype.add(SubType.ROGUE); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/ArmyAnts.java b/Mage.Sets/src/mage/cards/a/ArmyAnts.java index 2dabe8fb864..89f6afb3dbc 100644 --- a/Mage.Sets/src/mage/cards/a/ArmyAnts.java +++ b/Mage.Sets/src/mage/cards/a/ArmyAnts.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.target.common.TargetControlledPermanent; @@ -51,7 +52,7 @@ public class ArmyAnts extends CardImpl { public ArmyAnts(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{R}"); - this.subtype.add("Insect"); + this.subtype.add(SubType.INSECT); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/Arrest.java b/Mage.Sets/src/mage/cards/a/Arrest.java index ec47b9a7c02..d1cf3e9a141 100644 --- a/Mage.Sets/src/mage/cards/a/Arrest.java +++ b/Mage.Sets/src/mage/cards/a/Arrest.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -51,7 +52,7 @@ public class Arrest extends CardImpl { public Arrest (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature diff --git a/Mage.Sets/src/mage/cards/a/ArrogantBloodlord.java b/Mage.Sets/src/mage/cards/a/ArrogantBloodlord.java index c6d2d55ce9b..3cd6cfea604 100644 --- a/Mage.Sets/src/mage/cards/a/ArrogantBloodlord.java +++ b/Mage.Sets/src/mage/cards/a/ArrogantBloodlord.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -54,8 +55,8 @@ public class ArrogantBloodlord extends CardImpl { public ArrogantBloodlord(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}{B}"); - this.subtype.add("Vampire"); - this.subtype.add("Knight"); + this.subtype.add(SubType.VAMPIRE); + this.subtype.add(SubType.KNIGHT); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/ArrogantVampire.java b/Mage.Sets/src/mage/cards/a/ArrogantVampire.java index 6241d0ccd00..ef50cb0f666 100644 --- a/Mage.Sets/src/mage/cards/a/ArrogantVampire.java +++ b/Mage.Sets/src/mage/cards/a/ArrogantVampire.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,7 +44,7 @@ public class ArrogantVampire extends CardImpl { public ArrogantVampire(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}"); - this.subtype.add("Vampire"); + this.subtype.add(SubType.VAMPIRE); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/ArrogantWurm.java b/Mage.Sets/src/mage/cards/a/ArrogantWurm.java index bfe589cf651..3cb5f83b32a 100644 --- a/Mage.Sets/src/mage/cards/a/ArrogantWurm.java +++ b/Mage.Sets/src/mage/cards/a/ArrogantWurm.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,7 +46,7 @@ public class ArrogantWurm extends CardImpl { public ArrogantWurm(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}"); - this.subtype.add("Wurm"); + this.subtype.add(SubType.WURM); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/ArrowVolleyTrap.java b/Mage.Sets/src/mage/cards/a/ArrowVolleyTrap.java index 55894fe7bc2..3282fd5b163 100644 --- a/Mage.Sets/src/mage/cards/a/ArrowVolleyTrap.java +++ b/Mage.Sets/src/mage/cards/a/ArrowVolleyTrap.java @@ -35,6 +35,7 @@ import mage.abilities.effects.common.DamageMultiEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterAttackingCreature; import mage.game.Game; import mage.target.common.TargetCreaturePermanentAmount; @@ -48,7 +49,7 @@ public class ArrowVolleyTrap extends CardImpl { public ArrowVolleyTrap(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{W}{W}"); - this.subtype.add("Trap"); + this.subtype.add(SubType.TRAP); // If four or more creatures are attacking, you may pay {1}{W} rather than pay Arrow Volley Trap's mana cost. this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl("{1}{W}"), ArrowVolleyTrapCondition.instance)); diff --git a/Mage.Sets/src/mage/cards/a/ArsenalThresher.java b/Mage.Sets/src/mage/cards/a/ArsenalThresher.java index 6d29d90343e..8c52c37a139 100644 --- a/Mage.Sets/src/mage/cards/a/ArsenalThresher.java +++ b/Mage.Sets/src/mage/cards/a/ArsenalThresher.java @@ -27,8 +27,6 @@ */ package mage.cards.a; -import java.util.ArrayList; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.AsEntersBattlefieldAbility; @@ -39,6 +37,7 @@ import mage.cards.Cards; import mage.cards.CardsImpl; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterArtifactCard; import mage.filter.predicate.mageobject.AnotherCardPredicate; @@ -47,6 +46,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInHand; +import java.util.ArrayList; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -55,7 +57,7 @@ public class ArsenalThresher extends CardImpl { public ArsenalThresher(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{2}{W/B}{U}"); - this.subtype.add("Construct"); + this.subtype.add(SubType.CONSTRUCT); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/ArtifactPossession.java b/Mage.Sets/src/mage/cards/a/ArtifactPossession.java index c8e10e79aa5..6b5d0be8432 100644 --- a/Mage.Sets/src/mage/cards/a/ArtifactPossession.java +++ b/Mage.Sets/src/mage/cards/a/ArtifactPossession.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -53,7 +54,7 @@ public class ArtifactPossession extends CardImpl { public ArtifactPossession(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant artifact TargetPermanent auraTarget = new TargetArtifactPermanent(); diff --git a/Mage.Sets/src/mage/cards/a/ArtifactWard.java b/Mage.Sets/src/mage/cards/a/ArtifactWard.java index cfc268c738a..682b12e9cc5 100644 --- a/Mage.Sets/src/mage/cards/a/ArtifactWard.java +++ b/Mage.Sets/src/mage/cards/a/ArtifactWard.java @@ -34,10 +34,7 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterArtifactCard; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -52,7 +49,7 @@ public class ArtifactWard extends CardImpl { public ArtifactWard(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{W}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/cards/a/ArtificersHex.java b/Mage.Sets/src/mage/cards/a/ArtificersHex.java index 23a7315d17c..790804a5135 100644 --- a/Mage.Sets/src/mage/cards/a/ArtificersHex.java +++ b/Mage.Sets/src/mage/cards/a/ArtificersHex.java @@ -58,7 +58,7 @@ public class ArtificersHex extends CardImpl { public ArtificersHex(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{B}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant Equipment diff --git a/Mage.Sets/src/mage/cards/a/ArtisanOfForms.java b/Mage.Sets/src/mage/cards/a/ArtisanOfForms.java index 2be9c0d2801..4fbb3db2f18 100644 --- a/Mage.Sets/src/mage/cards/a/ArtisanOfForms.java +++ b/Mage.Sets/src/mage/cards/a/ArtisanOfForms.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.abilities.Ability; @@ -37,12 +36,15 @@ import mage.abilities.keyword.HeroicAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; import mage.util.functions.ApplyToPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -51,8 +53,8 @@ public class ArtisanOfForms extends CardImpl { public ArtisanOfForms(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/ArtisanOfKozilek.java b/Mage.Sets/src/mage/cards/a/ArtisanOfKozilek.java index eca14631053..a9e0c788842 100644 --- a/Mage.Sets/src/mage/cards/a/ArtisanOfKozilek.java +++ b/Mage.Sets/src/mage/cards/a/ArtisanOfKozilek.java @@ -36,6 +36,7 @@ import mage.abilities.keyword.AnnihilatorAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterCreatureCard; import mage.target.common.TargetCardInYourGraveyard; @@ -49,7 +50,7 @@ public class ArtisanOfKozilek extends CardImpl { public ArtisanOfKozilek (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{9}"); - this.subtype.add("Eldrazi"); + this.subtype.add(SubType.ELDRAZI); this.power = new MageInt(10); this.toughness = new MageInt(9); // When you cast Artisan of Kozilek, you may return target creature card from your graveyard to the battlefield. diff --git a/Mage.Sets/src/mage/cards/a/AsajjVentress.java b/Mage.Sets/src/mage/cards/a/AsajjVentress.java index 99cb57c37fe..05c0f65a1ab 100644 --- a/Mage.Sets/src/mage/cards/a/AsajjVentress.java +++ b/Mage.Sets/src/mage/cards/a/AsajjVentress.java @@ -42,6 +42,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.SuperType; import mage.target.common.TargetCreaturePermanent; import mage.watchers.common.LifeLossOtherFromCombatWatcher; @@ -56,8 +57,8 @@ public class AsajjVentress extends CardImpl { public AsajjVentress(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}{B}{R}"); this.addSuperType(SuperType.LEGENDARY); - this.subtype.add("Dathomirian"); - this.subtype.add("Sith"); + this.subtype.add(SubType.DATHOMIRIAN); + this.subtype.add(SubType.SITH); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AscendantEvincar.java b/Mage.Sets/src/mage/cards/a/AscendantEvincar.java index d94a7965573..f6a3ed25c38 100644 --- a/Mage.Sets/src/mage/cards/a/AscendantEvincar.java +++ b/Mage.Sets/src/mage/cards/a/AscendantEvincar.java @@ -34,10 +34,7 @@ import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.ColorPredicate; @@ -61,7 +58,7 @@ public class AscendantEvincar extends CardImpl { public AscendantEvincar(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{B}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Vampire"); + this.subtype.add(SubType.VAMPIRE); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AscendedLawmage.java b/Mage.Sets/src/mage/cards/a/AscendedLawmage.java index 02531778d81..ba40eb1d08a 100644 --- a/Mage.Sets/src/mage/cards/a/AscendedLawmage.java +++ b/Mage.Sets/src/mage/cards/a/AscendedLawmage.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -47,8 +48,8 @@ public class AscendedLawmage extends CardImpl { public AscendedLawmage (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{U}"); - this.subtype.add("Vedalken"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.VEDALKEN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AscendingAven.java b/Mage.Sets/src/mage/cards/a/AscendingAven.java index eab5c9ed03a..b8572417dc9 100644 --- a/Mage.Sets/src/mage/cards/a/AscendingAven.java +++ b/Mage.Sets/src/mage/cards/a/AscendingAven.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.MorphAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -46,8 +47,8 @@ public class AscendingAven extends CardImpl { public AscendingAven(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}"); - this.subtype.add("Bird"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AshZealot.java b/Mage.Sets/src/mage/cards/a/AshZealot.java index 4932895583b..9a8a66e5256 100644 --- a/Mage.Sets/src/mage/cards/a/AshZealot.java +++ b/Mage.Sets/src/mage/cards/a/AshZealot.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -55,8 +56,8 @@ public class AshZealot extends CardImpl { public AshZealot (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}{R}"); - this.subtype.add("Human"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AshasFavor.java b/Mage.Sets/src/mage/cards/a/AshasFavor.java index e9fe80e8c4a..fb57af71375 100644 --- a/Mage.Sets/src/mage/cards/a/AshasFavor.java +++ b/Mage.Sets/src/mage/cards/a/AshasFavor.java @@ -38,10 +38,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -55,7 +52,7 @@ public class AshasFavor extends CardImpl { public AshasFavor (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/cards/a/AshcloudPhoenix.java b/Mage.Sets/src/mage/cards/a/AshcloudPhoenix.java index 29d6cf022fb..0937b72d6bb 100644 --- a/Mage.Sets/src/mage/cards/a/AshcloudPhoenix.java +++ b/Mage.Sets/src/mage/cards/a/AshcloudPhoenix.java @@ -40,10 +40,7 @@ import mage.abilities.keyword.MorphAbility; 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.game.Game; import mage.players.Player; @@ -57,7 +54,7 @@ public class AshcloudPhoenix extends CardImpl { public AshcloudPhoenix(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); - this.subtype.add("Phoenix"); + this.subtype.add(SubType.PHOENIX); this.power = new MageInt(4); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AshcoatBear.java b/Mage.Sets/src/mage/cards/a/AshcoatBear.java index 75cccc0ffb1..bb874ba29ad 100644 --- a/Mage.Sets/src/mage/cards/a/AshcoatBear.java +++ b/Mage.Sets/src/mage/cards/a/AshcoatBear.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,7 +44,7 @@ public class AshcoatBear extends CardImpl { public AshcoatBear(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); - this.subtype.add("Bear"); + this.subtype.add(SubType.BEAR); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AshenFirebeast.java b/Mage.Sets/src/mage/cards/a/AshenFirebeast.java index b611905e20b..cc1eb987ff5 100644 --- a/Mage.Sets/src/mage/cards/a/AshenFirebeast.java +++ b/Mage.Sets/src/mage/cards/a/AshenFirebeast.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; @@ -55,8 +56,8 @@ public class AshenFirebeast extends CardImpl { public AshenFirebeast(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{6}{R}{R}"); - this.subtype.add("Elemental"); - this.subtype.add("Beast"); + this.subtype.add(SubType.ELEMENTAL); + this.subtype.add(SubType.BEAST); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/AshenMonstrosity.java b/Mage.Sets/src/mage/cards/a/AshenMonstrosity.java index fe7579ff314..9cf88d67f45 100644 --- a/Mage.Sets/src/mage/cards/a/AshenMonstrosity.java +++ b/Mage.Sets/src/mage/cards/a/AshenMonstrosity.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,7 +45,7 @@ public class AshenMonstrosity extends CardImpl { public AshenMonstrosity(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{R}{R}"); - this.subtype.add("Spirit"); + this.subtype.add(SubType.SPIRIT); this.power = new MageInt(7); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AshenRider.java b/Mage.Sets/src/mage/cards/a/AshenRider.java index 48ec6b47a27..bf8e777b1d9 100644 --- a/Mage.Sets/src/mage/cards/a/AshenRider.java +++ b/Mage.Sets/src/mage/cards/a/AshenRider.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.target.TargetPermanent; import java.util.UUID; @@ -47,7 +48,7 @@ public class AshenRider extends CardImpl { public AshenRider(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}{W}{B}{B}"); - this.subtype.add("Archon"); + this.subtype.add(SubType.ARCHON); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AshenSkinZubera.java b/Mage.Sets/src/mage/cards/a/AshenSkinZubera.java index 87763397c91..defd63de62a 100644 --- a/Mage.Sets/src/mage/cards/a/AshenSkinZubera.java +++ b/Mage.Sets/src/mage/cards/a/AshenSkinZubera.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.target.common.TargetOpponent; import mage.watchers.common.ZuberasDiedWatcher; @@ -48,8 +49,8 @@ public class AshenSkinZubera extends CardImpl { public AshenSkinZubera(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}"); - this.subtype.add("Zubera"); - this.subtype.add("Spirit"); + this.subtype.add(SubType.ZUBERA); + this.subtype.add(SubType.SPIRIT); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AshenmoorCohort.java b/Mage.Sets/src/mage/cards/a/AshenmoorCohort.java index bf6411c8744..13c7d855c15 100644 --- a/Mage.Sets/src/mage/cards/a/AshenmoorCohort.java +++ b/Mage.Sets/src/mage/cards/a/AshenmoorCohort.java @@ -29,7 +29,6 @@ package mage.cards.a; import mage.MageInt; import mage.ObjectColor; -import mage.constants.ComparisonType; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; @@ -37,9 +36,7 @@ import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.permanent.AnotherPredicate; @@ -62,8 +59,8 @@ public class AshenmoorCohort extends CardImpl { public AshenmoorCohort(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{B}"); - this.subtype.add("Elemental"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.ELEMENTAL); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AshenmoorGouger.java b/Mage.Sets/src/mage/cards/a/AshenmoorGouger.java index 7d0f7e58dfa..9c94385f348 100644 --- a/Mage.Sets/src/mage/cards/a/AshenmoorGouger.java +++ b/Mage.Sets/src/mage/cards/a/AshenmoorGouger.java @@ -32,6 +32,7 @@ import mage.abilities.common.CantBlockAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,8 +44,8 @@ public class AshenmoorGouger extends CardImpl { public AshenmoorGouger(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B/R}{B/R}{B/R}"); - this.subtype.add("Elemental"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.ELEMENTAL); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AshenmoorLiege.java b/Mage.Sets/src/mage/cards/a/AshenmoorLiege.java index 39cc4dddf31..2abcf3ddcee 100644 --- a/Mage.Sets/src/mage/cards/a/AshenmoorLiege.java +++ b/Mage.Sets/src/mage/cards/a/AshenmoorLiege.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; @@ -64,8 +65,8 @@ public class AshenmoorLiege extends CardImpl { public AshenmoorLiege(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B/R}{B/R}{B/R}"); - this.subtype.add("Elemental"); - this.subtype.add("Knight"); + this.subtype.add(SubType.ELEMENTAL); + this.subtype.add(SubType.KNIGHT); this.power = new MageInt(4); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AshiokNightmareWeaver.java b/Mage.Sets/src/mage/cards/a/AshiokNightmareWeaver.java index 31061db2e6b..a7abdd16f62 100644 --- a/Mage.Sets/src/mage/cards/a/AshiokNightmareWeaver.java +++ b/Mage.Sets/src/mage/cards/a/AshiokNightmareWeaver.java @@ -60,7 +60,7 @@ public class AshiokNightmareWeaver extends CardImpl { public AshiokNightmareWeaver(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.PLANESWALKER},"{1}{U}{B}"); - this.subtype.add("Ashiok"); + this.subtype.add(SubType.ASHIOK); this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(3)); diff --git a/Mage.Sets/src/mage/cards/a/AshioksAdept.java b/Mage.Sets/src/mage/cards/a/AshioksAdept.java index da6d55e27ce..9bce582449d 100644 --- a/Mage.Sets/src/mage/cards/a/AshioksAdept.java +++ b/Mage.Sets/src/mage/cards/a/AshioksAdept.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.HeroicAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.TargetController; import java.util.UUID; @@ -45,8 +46,8 @@ public class AshioksAdept extends CardImpl { public AshioksAdept(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AshlingTheExtinguisher.java b/Mage.Sets/src/mage/cards/a/AshlingTheExtinguisher.java index 496d03eb2d0..904192d5fa8 100644 --- a/Mage.Sets/src/mage/cards/a/AshlingTheExtinguisher.java +++ b/Mage.Sets/src/mage/cards/a/AshlingTheExtinguisher.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.SacrificeTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; @@ -55,8 +56,8 @@ public class AshlingTheExtinguisher extends CardImpl { public AshlingTheExtinguisher(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}{B}"); this.addSuperType(SuperType.LEGENDARY); - this.subtype.add("Elemental"); - this.subtype.add("Shaman"); + this.subtype.add(SubType.ELEMENTAL); + this.subtype.add(SubType.SHAMAN); // Whenever Ashling, the Extinguisher deals combat damage to a player, choose target creature that player controls. He or she sacrifices that creature. this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AshlingThePilgrim.java b/Mage.Sets/src/mage/cards/a/AshlingThePilgrim.java index d930dc22a7f..830d97bd033 100644 --- a/Mage.Sets/src/mage/cards/a/AshlingThePilgrim.java +++ b/Mage.Sets/src/mage/cards/a/AshlingThePilgrim.java @@ -36,10 +36,7 @@ import mage.abilities.effects.common.DamageEverythingEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -57,8 +54,8 @@ public class AshlingThePilgrim extends CardImpl { public AshlingThePilgrim(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Elemental"); - this.subtype.add("Shaman"); + this.subtype.add(SubType.ELEMENTAL); + this.subtype.add(SubType.SHAMAN); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AshmouthBlade.java b/Mage.Sets/src/mage/cards/a/AshmouthBlade.java index dc9402c9e22..495dd8a1ebd 100644 --- a/Mage.Sets/src/mage/cards/a/AshmouthBlade.java +++ b/Mage.Sets/src/mage/cards/a/AshmouthBlade.java @@ -37,10 +37,7 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import java.util.UUID; @@ -52,7 +49,7 @@ public class AshmouthBlade extends CardImpl { public AshmouthBlade(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},""); - this.subtype.add("Equipment"); + this.subtype.add(SubType.EQUIPMENT); // this card is the second face of double-faced card this.nightCard = true; diff --git a/Mage.Sets/src/mage/cards/a/AshmouthHound.java b/Mage.Sets/src/mage/cards/a/AshmouthHound.java index 51f6a2145e9..39f9dba016b 100644 --- a/Mage.Sets/src/mage/cards/a/AshmouthHound.java +++ b/Mage.Sets/src/mage/cards/a/AshmouthHound.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,8 +45,8 @@ public class AshmouthHound extends CardImpl { public AshmouthHound(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}"); - this.subtype.add("Elemental"); - this.subtype.add("Hound"); + this.subtype.add(SubType.ELEMENTAL); + this.subtype.add(SubType.HOUND); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AsmiraHolyAvenger.java b/Mage.Sets/src/mage/cards/a/AsmiraHolyAvenger.java index c1a1af8b3a0..56d67f2954a 100644 --- a/Mage.Sets/src/mage/cards/a/AsmiraHolyAvenger.java +++ b/Mage.Sets/src/mage/cards/a/AsmiraHolyAvenger.java @@ -55,8 +55,8 @@ public class AsmiraHolyAvenger extends CardImpl { public AsmiraHolyAvenger(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{W}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Human"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AspectOfGorgon.java b/Mage.Sets/src/mage/cards/a/AspectOfGorgon.java index df9c8d6aca2..c9d91c537a4 100644 --- a/Mage.Sets/src/mage/cards/a/AspectOfGorgon.java +++ b/Mage.Sets/src/mage/cards/a/AspectOfGorgon.java @@ -51,7 +51,7 @@ public class AspectOfGorgon extends CardImpl { public AspectOfGorgon(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature diff --git a/Mage.Sets/src/mage/cards/a/AspectOfMongoose.java b/Mage.Sets/src/mage/cards/a/AspectOfMongoose.java index a146bab10b6..8466cb98935 100644 --- a/Mage.Sets/src/mage/cards/a/AspectOfMongoose.java +++ b/Mage.Sets/src/mage/cards/a/AspectOfMongoose.java @@ -37,10 +37,7 @@ import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.ShroudAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; @@ -54,7 +51,7 @@ public class AspectOfMongoose extends CardImpl { public AspectOfMongoose(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{G}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature diff --git a/Mage.Sets/src/mage/cards/a/AspectOfWolf.java b/Mage.Sets/src/mage/cards/a/AspectOfWolf.java index b8dd286bcf0..758f1787c5b 100644 --- a/Mage.Sets/src/mage/cards/a/AspectOfWolf.java +++ b/Mage.Sets/src/mage/cards/a/AspectOfWolf.java @@ -54,7 +54,7 @@ public class AspectOfWolf extends CardImpl { public AspectOfWolf(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{G}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature diff --git a/Mage.Sets/src/mage/cards/a/AsphodelWanderer.java b/Mage.Sets/src/mage/cards/a/AsphodelWanderer.java index 9bbf6d0f7bf..36631e4f44e 100644 --- a/Mage.Sets/src/mage/cards/a/AsphodelWanderer.java +++ b/Mage.Sets/src/mage/cards/a/AsphodelWanderer.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.RegenerateSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -46,8 +47,8 @@ public class AsphodelWanderer extends CardImpl { public AsphodelWanderer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}"); - this.subtype.add("Skeleton"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.SKELETON); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AspiringAeronaut.java b/Mage.Sets/src/mage/cards/a/AspiringAeronaut.java index 4ab450e4ba9..a3c81d033a9 100644 --- a/Mage.Sets/src/mage/cards/a/AspiringAeronaut.java +++ b/Mage.Sets/src/mage/cards/a/AspiringAeronaut.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.game.permanent.token.ThopterColorlessToken; import java.util.UUID; @@ -46,8 +47,8 @@ public class AspiringAeronaut extends CardImpl { public AspiringAeronaut(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}"); - this.subtype.add("Human"); - this.subtype.add("Artificer"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.ARTIFICER); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AssaultGriffin.java b/Mage.Sets/src/mage/cards/a/AssaultGriffin.java index 14a3c17ee27..6f309e8b792 100644 --- a/Mage.Sets/src/mage/cards/a/AssaultGriffin.java +++ b/Mage.Sets/src/mage/cards/a/AssaultGriffin.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,7 +46,7 @@ public class AssaultGriffin extends CardImpl { public AssaultGriffin(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add("Griffin"); + this.subtype.add(SubType.GRIFFIN); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AssaultSuit.java b/Mage.Sets/src/mage/cards/a/AssaultSuit.java index 79db858e7bc..0eb68120327 100644 --- a/Mage.Sets/src/mage/cards/a/AssaultSuit.java +++ b/Mage.Sets/src/mage/cards/a/AssaultSuit.java @@ -60,7 +60,7 @@ public class AssaultSuit extends CardImpl { public AssaultSuit(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - this.subtype.add("Equipment"); + this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+2, has haste, can't attack you or a planeswalker you control, and can't be sacrificed. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 2)); diff --git a/Mage.Sets/src/mage/cards/a/AssaultZeppelid.java b/Mage.Sets/src/mage/cards/a/AssaultZeppelid.java index ab3791b9fba..d93007281ee 100644 --- a/Mage.Sets/src/mage/cards/a/AssaultZeppelid.java +++ b/Mage.Sets/src/mage/cards/a/AssaultZeppelid.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,7 +45,7 @@ public class AssaultZeppelid extends CardImpl { public AssaultZeppelid(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{U}"); - this.subtype.add("Beast"); + this.subtype.add(SubType.BEAST); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AssembledAlphas.java b/Mage.Sets/src/mage/cards/a/AssembledAlphas.java index 42528e32b7c..753a33618a7 100644 --- a/Mage.Sets/src/mage/cards/a/AssembledAlphas.java +++ b/Mage.Sets/src/mage/cards/a/AssembledAlphas.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -47,7 +48,7 @@ public class AssembledAlphas extends CardImpl { public AssembledAlphas(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{R}"); - this.subtype.add("Wolf"); + this.subtype.add(SubType.WOLF); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AssemblyWorker.java b/Mage.Sets/src/mage/cards/a/AssemblyWorker.java index f16d3f5977f..28252de797e 100644 --- a/Mage.Sets/src/mage/cards/a/AssemblyWorker.java +++ b/Mage.Sets/src/mage/cards/a/AssemblyWorker.java @@ -58,7 +58,7 @@ public class AssemblyWorker extends CardImpl { public AssemblyWorker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{3}"); - this.subtype.add("Assembly-Worker"); + this.subtype.add(SubType.ASSEMBLY_WORKER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AsylumVisitor.java b/Mage.Sets/src/mage/cards/a/AsylumVisitor.java index 3b2674cc8a5..5eb90a52926 100644 --- a/Mage.Sets/src/mage/cards/a/AsylumVisitor.java +++ b/Mage.Sets/src/mage/cards/a/AsylumVisitor.java @@ -29,7 +29,6 @@ package mage.cards.a; import mage.MageInt; import mage.abilities.Ability; -import mage.constants.ComparisonType; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.condition.common.CardsInHandCondition; import mage.abilities.costs.mana.ManaCostsImpl; @@ -41,6 +40,8 @@ import mage.abilities.keyword.MadnessAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.ComparisonType; +import mage.constants.SubType; import mage.constants.TargetController; import java.util.UUID; @@ -53,8 +54,8 @@ public class AsylumVisitor extends CardImpl { public AsylumVisitor(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}"); - this.subtype.add("Vampire"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.VAMPIRE); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AtalyaSamiteMaster.java b/Mage.Sets/src/mage/cards/a/AtalyaSamiteMaster.java index 448585cd7a6..b3a2d9b4d49 100644 --- a/Mage.Sets/src/mage/cards/a/AtalyaSamiteMaster.java +++ b/Mage.Sets/src/mage/cards/a/AtalyaSamiteMaster.java @@ -40,10 +40,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.PreventDamageToTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterMana; import mage.target.common.TargetCreaturePermanent; @@ -65,8 +62,8 @@ public class AtalyaSamiteMaster extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}{W}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Human"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AtarkaBeastbreaker.java b/Mage.Sets/src/mage/cards/a/AtarkaBeastbreaker.java index 15f9fd28951..8892d3d5b47 100644 --- a/Mage.Sets/src/mage/cards/a/AtarkaBeastbreaker.java +++ b/Mage.Sets/src/mage/cards/a/AtarkaBeastbreaker.java @@ -35,10 +35,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AbilityWord; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; +import mage.constants.*; import java.util.UUID; @@ -50,8 +47,8 @@ public class AtarkaBeastbreaker extends CardImpl { public AtarkaBeastbreaker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); - this.subtype.add("Human"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AtarkaEfreet.java b/Mage.Sets/src/mage/cards/a/AtarkaEfreet.java index 00960108699..ad269d6fc76 100644 --- a/Mage.Sets/src/mage/cards/a/AtarkaEfreet.java +++ b/Mage.Sets/src/mage/cards/a/AtarkaEfreet.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.MorphAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.target.common.TargetCreatureOrPlayer; import java.util.UUID; @@ -49,8 +50,8 @@ public class AtarkaEfreet extends CardImpl { public AtarkaEfreet(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); - this.subtype.add("Efreet"); - this.subtype.add("Shaman"); + this.subtype.add(SubType.EFREET); + this.subtype.add(SubType.SHAMAN); this.power = new MageInt(5); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AtarkaMonument.java b/Mage.Sets/src/mage/cards/a/AtarkaMonument.java index e4716224fae..ae97808a5ba 100644 --- a/Mage.Sets/src/mage/cards/a/AtarkaMonument.java +++ b/Mage.Sets/src/mage/cards/a/AtarkaMonument.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.permanent.token.Token; @@ -77,7 +78,7 @@ public class AtarkaMonument extends CardImpl { cardType.add(CardType.CREATURE); color.setRed(true); color.setGreen(true); - this.subtype.add("Dragon"); + this.subtype.add(SubType.DRAGON); power = new MageInt(4); toughness = new MageInt(4); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/cards/a/AtarkaPummeler.java b/Mage.Sets/src/mage/cards/a/AtarkaPummeler.java index 30d34ce1b87..1dd15fb8f57 100644 --- a/Mage.Sets/src/mage/cards/a/AtarkaPummeler.java +++ b/Mage.Sets/src/mage/cards/a/AtarkaPummeler.java @@ -56,8 +56,8 @@ public class AtarkaPummeler extends CardImpl { public AtarkaPummeler(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}"); - this.subtype.add("Ogre"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.OGRE); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AtarkaWorldRender.java b/Mage.Sets/src/mage/cards/a/AtarkaWorldRender.java index 991449be2f1..64a12aba272 100644 --- a/Mage.Sets/src/mage/cards/a/AtarkaWorldRender.java +++ b/Mage.Sets/src/mage/cards/a/AtarkaWorldRender.java @@ -55,7 +55,7 @@ public class AtarkaWorldRender extends CardImpl { public AtarkaWorldRender(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{R}{G}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Dragon"); + this.subtype.add(SubType.DRAGON); this.power = new MageInt(6); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AthreosGodOfPassage.java b/Mage.Sets/src/mage/cards/a/AthreosGodOfPassage.java index ffcb86a595c..16aaa2d0eb5 100644 --- a/Mage.Sets/src/mage/cards/a/AthreosGodOfPassage.java +++ b/Mage.Sets/src/mage/cards/a/AthreosGodOfPassage.java @@ -70,7 +70,7 @@ public class AthreosGodOfPassage extends CardImpl { public AthreosGodOfPassage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT,CardType.CREATURE},"{1}{W}{B}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("God"); + this.subtype.add(SubType.GOD); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/Atog.java b/Mage.Sets/src/mage/cards/a/Atog.java index dfdf7748979..71d8adb75a6 100644 --- a/Mage.Sets/src/mage/cards/a/Atog.java +++ b/Mage.Sets/src/mage/cards/a/Atog.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -56,7 +57,7 @@ public class Atog extends CardImpl { public Atog(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}"); - this.subtype.add("Atog"); + this.subtype.add(SubType.ATOG); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/Atogatog.java b/Mage.Sets/src/mage/cards/a/Atogatog.java index 33503314142..e0f2a5a325f 100644 --- a/Mage.Sets/src/mage/cards/a/Atogatog.java +++ b/Mage.Sets/src/mage/cards/a/Atogatog.java @@ -59,7 +59,7 @@ public class Atogatog extends CardImpl { public Atogatog(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{U}{B}{R}{G}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Atog"); + this.subtype.add(SubType.ATOG); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AtraxaPraetorsVoice.java b/Mage.Sets/src/mage/cards/a/AtraxaPraetorsVoice.java index 00ffd5fdb9b..96c3cddddf8 100644 --- a/Mage.Sets/src/mage/cards/a/AtraxaPraetorsVoice.java +++ b/Mage.Sets/src/mage/cards/a/AtraxaPraetorsVoice.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.TargetController; @@ -52,8 +53,8 @@ public class AtraxaPraetorsVoice extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{G}{W}{U}{B}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Angel"); - this.subtype.add("Horror"); + this.subtype.add(SubType.ANGEL); + this.subtype.add(SubType.HORROR); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AttendedKnight.java b/Mage.Sets/src/mage/cards/a/AttendedKnight.java index bc2d3b6556e..1c160f43526 100644 --- a/Mage.Sets/src/mage/cards/a/AttendedKnight.java +++ b/Mage.Sets/src/mage/cards/a/AttendedKnight.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.FirstStrikeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.game.permanent.token.SoldierToken; import java.util.UUID; @@ -46,8 +47,8 @@ public class AttendedKnight extends CardImpl { public AttendedKnight(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}"); - this.subtype.add("Human"); - this.subtype.add("Knight"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.KNIGHT); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AudaciousInfiltrator.java b/Mage.Sets/src/mage/cards/a/AudaciousInfiltrator.java index 8c919cfa388..e0b51eef7b3 100644 --- a/Mage.Sets/src/mage/cards/a/AudaciousInfiltrator.java +++ b/Mage.Sets/src/mage/cards/a/AudaciousInfiltrator.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.StaticFilters; @@ -49,8 +50,8 @@ public class AudaciousInfiltrator extends CardImpl { public AudaciousInfiltrator(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}"); - this.subtype.add("Dwarf"); - this.subtype.add("Rogue"); + this.subtype.add(SubType.DWARF); + this.subtype.add(SubType.ROGUE); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AugmentingAutomaton.java b/Mage.Sets/src/mage/cards/a/AugmentingAutomaton.java index b68fab8a51c..05f708130c5 100644 --- a/Mage.Sets/src/mage/cards/a/AugmentingAutomaton.java +++ b/Mage.Sets/src/mage/cards/a/AugmentingAutomaton.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -48,7 +49,7 @@ public class AugmentingAutomaton extends CardImpl { public AugmentingAutomaton(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{1}"); - this.subtype.add("Construct"); + this.subtype.add(SubType.CONSTRUCT); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AugurIlVec.java b/Mage.Sets/src/mage/cards/a/AugurIlVec.java index 4f159ffd1af..d5033c23e47 100644 --- a/Mage.Sets/src/mage/cards/a/AugurIlVec.java +++ b/Mage.Sets/src/mage/cards/a/AugurIlVec.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.PhaseStep; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -49,8 +50,8 @@ public class AugurIlVec extends CardImpl { public AugurIlVec(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Human"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AugurOfBolas.java b/Mage.Sets/src/mage/cards/a/AugurOfBolas.java index 9990f083485..83b2b8fcea4 100644 --- a/Mage.Sets/src/mage/cards/a/AugurOfBolas.java +++ b/Mage.Sets/src/mage/cards/a/AugurOfBolas.java @@ -35,6 +35,7 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.common.FilterInstantOrSorceryCard; @@ -61,8 +62,8 @@ public class AugurOfBolas extends CardImpl { public AugurOfBolas(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}"); - this.subtype.add("Merfolk"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.MERFOLK); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AugurOfSkulls.java b/Mage.Sets/src/mage/cards/a/AugurOfSkulls.java index 297af9b865a..777f6d44454 100644 --- a/Mage.Sets/src/mage/cards/a/AugurOfSkulls.java +++ b/Mage.Sets/src/mage/cards/a/AugurOfSkulls.java @@ -40,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.PhaseStep; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.TargetPlayer; @@ -53,8 +54,8 @@ public class AugurOfSkulls extends CardImpl { public AugurOfSkulls(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}"); - this.subtype.add("Skeleton"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.SKELETON); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AuguryAdept.java b/Mage.Sets/src/mage/cards/a/AuguryAdept.java index 4d6bd8ec46f..75e4bd9db17 100644 --- a/Mage.Sets/src/mage/cards/a/AuguryAdept.java +++ b/Mage.Sets/src/mage/cards/a/AuguryAdept.java @@ -35,6 +35,7 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; @@ -49,8 +50,8 @@ public class AuguryAdept extends CardImpl { public AuguryAdept(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W/U}{W/U}"); - this.subtype.add("Kithkin"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.KITHKIN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AuguryOwl.java b/Mage.Sets/src/mage/cards/a/AuguryOwl.java index 4718fdf93cc..3e451a5a983 100644 --- a/Mage.Sets/src/mage/cards/a/AuguryOwl.java +++ b/Mage.Sets/src/mage/cards/a/AuguryOwl.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -46,7 +47,7 @@ public class AuguryOwl extends CardImpl { public AuguryOwl(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); - this.subtype.add("Bird"); + this.subtype.add(SubType.BIRD); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AuntiesSnitch.java b/Mage.Sets/src/mage/cards/a/AuntiesSnitch.java index 7f5af6d8447..dd1aa766e0d 100644 --- a/Mage.Sets/src/mage/cards/a/AuntiesSnitch.java +++ b/Mage.Sets/src/mage/cards/a/AuntiesSnitch.java @@ -58,8 +58,8 @@ public class AuntiesSnitch extends CardImpl { public AuntiesSnitch(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}"); - this.subtype.add("Goblin"); - this.subtype.add("Rogue"); + this.subtype.add(SubType.GOBLIN); + this.subtype.add(SubType.ROGUE); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AuraBarbs.java b/Mage.Sets/src/mage/cards/a/AuraBarbs.java index ed9f5f84083..4d5daaf8972 100644 --- a/Mage.Sets/src/mage/cards/a/AuraBarbs.java +++ b/Mage.Sets/src/mage/cards/a/AuraBarbs.java @@ -51,7 +51,7 @@ public class AuraBarbs extends CardImpl { public AuraBarbs(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}"); - this.subtype.add("Arcane"); + this.subtype.add(SubType.ARCANE); // Each enchantment deals 2 damage to its controller, then each Aura attached to a creature deals 2 damage to the creature it's attached to. diff --git a/Mage.Sets/src/mage/cards/a/AuraGnarlid.java b/Mage.Sets/src/mage/cards/a/AuraGnarlid.java index d09f186f634..553a7453d4e 100644 --- a/Mage.Sets/src/mage/cards/a/AuraGnarlid.java +++ b/Mage.Sets/src/mage/cards/a/AuraGnarlid.java @@ -57,7 +57,7 @@ public class AuraGnarlid extends CardImpl { public AuraGnarlid(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); - this.subtype.add("Beast"); + this.subtype.add(SubType.BEAST); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AuraOfDominion.java b/Mage.Sets/src/mage/cards/a/AuraOfDominion.java index 0feeee3f691..ad7b873faa7 100644 --- a/Mage.Sets/src/mage/cards/a/AuraOfDominion.java +++ b/Mage.Sets/src/mage/cards/a/AuraOfDominion.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; @@ -63,7 +64,7 @@ public class AuraOfDominion extends CardImpl { public AuraOfDominion(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{U}{U}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); diff --git a/Mage.Sets/src/mage/cards/a/AuraThief.java b/Mage.Sets/src/mage/cards/a/AuraThief.java index 563ad2963e8..02274eb3251 100644 --- a/Mage.Sets/src/mage/cards/a/AuraThief.java +++ b/Mage.Sets/src/mage/cards/a/AuraThief.java @@ -17,6 +17,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; +import mage.constants.SubType; import mage.filter.common.FilterEnchantmentPermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -33,7 +34,7 @@ public class AuraThief extends CardImpl { public AuraThief(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}"); - this.subtype.add("Illusion"); + this.subtype.add(SubType.ILLUSION); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/Auramancer.java b/Mage.Sets/src/mage/cards/a/Auramancer.java index eb6d928570d..b95f07a7806 100644 --- a/Mage.Sets/src/mage/cards/a/Auramancer.java +++ b/Mage.Sets/src/mage/cards/a/Auramancer.java @@ -35,6 +35,7 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.common.TargetCardInYourGraveyard; @@ -54,8 +55,8 @@ public class Auramancer extends CardImpl { public Auramancer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AuramancersGuise.java b/Mage.Sets/src/mage/cards/a/AuramancersGuise.java index 4c417b5fa4d..aecf5fc21c9 100644 --- a/Mage.Sets/src/mage/cards/a/AuramancersGuise.java +++ b/Mage.Sets/src/mage/cards/a/AuramancersGuise.java @@ -56,7 +56,7 @@ public class AuramancersGuise extends CardImpl { public AuramancersGuise(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}{U}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); diff --git a/Mage.Sets/src/mage/cards/a/Auratog.java b/Mage.Sets/src/mage/cards/a/Auratog.java index 4bd07021b51..1162eb7437b 100644 --- a/Mage.Sets/src/mage/cards/a/Auratog.java +++ b/Mage.Sets/src/mage/cards/a/Auratog.java @@ -35,6 +35,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -56,7 +57,7 @@ public class Auratog extends CardImpl { public Auratog(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Atog"); + this.subtype.add(SubType.ATOG); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AuratouchedMage.java b/Mage.Sets/src/mage/cards/a/AuratouchedMage.java index 4b5e4085931..f621367ecd7 100644 --- a/Mage.Sets/src/mage/cards/a/AuratouchedMage.java +++ b/Mage.Sets/src/mage/cards/a/AuratouchedMage.java @@ -55,8 +55,8 @@ public class AuratouchedMage extends CardImpl { public AuratouchedMage(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{W}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AureliaTheWarleader.java b/Mage.Sets/src/mage/cards/a/AureliaTheWarleader.java index 5a01bc68c9f..5c934869f34 100644 --- a/Mage.Sets/src/mage/cards/a/AureliaTheWarleader.java +++ b/Mage.Sets/src/mage/cards/a/AureliaTheWarleader.java @@ -40,6 +40,7 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; @@ -60,7 +61,7 @@ public class AureliaTheWarleader extends CardImpl { addSuperType(SuperType.LEGENDARY); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AuriokBladewarden.java b/Mage.Sets/src/mage/cards/a/AuriokBladewarden.java index 84c1d75142c..e71f141c45b 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokBladewarden.java +++ b/Mage.Sets/src/mage/cards/a/AuriokBladewarden.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; @@ -50,8 +51,8 @@ public class AuriokBladewarden extends CardImpl { public AuriokBladewarden(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AuriokChampion.java b/Mage.Sets/src/mage/cards/a/AuriokChampion.java index 207e9b4af9f..0b9c635e350 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokChampion.java +++ b/Mage.Sets/src/mage/cards/a/AuriokChampion.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; @@ -55,8 +56,8 @@ public class AuriokChampion extends CardImpl { public AuriokChampion(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{W}{W}"); - this.subtype.add("Human"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AuriokEdgewright.java b/Mage.Sets/src/mage/cards/a/AuriokEdgewright.java index 1ddbd840507..f939452efe5 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokEdgewright.java +++ b/Mage.Sets/src/mage/cards/a/AuriokEdgewright.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -52,8 +53,8 @@ public class AuriokEdgewright extends CardImpl { public AuriokEdgewright(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AuriokGlaivemaster.java b/Mage.Sets/src/mage/cards/a/AuriokGlaivemaster.java index 8355ea65ff5..6fc036763c8 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokGlaivemaster.java +++ b/Mage.Sets/src/mage/cards/a/AuriokGlaivemaster.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -52,8 +53,8 @@ public class AuriokGlaivemaster extends CardImpl { public AuriokGlaivemaster(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AuriokReplica.java b/Mage.Sets/src/mage/cards/a/AuriokReplica.java index 3ac0867a4e3..b46eaa9d13d 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokReplica.java +++ b/Mage.Sets/src/mage/cards/a/AuriokReplica.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; @@ -53,7 +54,7 @@ public class AuriokReplica extends CardImpl { public AuriokReplica(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{3}"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AuriokSalvagers.java b/Mage.Sets/src/mage/cards/a/AuriokSalvagers.java index 641b0223af8..be334ef5fed 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokSalvagers.java +++ b/Mage.Sets/src/mage/cards/a/AuriokSalvagers.java @@ -29,13 +29,14 @@ package mage.cards.a; import mage.MageInt; import mage.abilities.Ability; -import mage.constants.ComparisonType; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.ComparisonType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterArtifactCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; @@ -56,8 +57,8 @@ public class AuriokSalvagers extends CardImpl { public AuriokSalvagers(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AuriokSiegeSled.java b/Mage.Sets/src/mage/cards/a/AuriokSiegeSled.java index 23b613f50f8..097920c527d 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokSiegeSled.java +++ b/Mage.Sets/src/mage/cards/a/AuriokSiegeSled.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -58,7 +59,7 @@ public class AuriokSiegeSled extends CardImpl { public AuriokSiegeSled(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{6}"); - this.subtype.add("Juggernaut"); + this.subtype.add(SubType.JUGGERNAUT); this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AuriokSteelshaper.java b/Mage.Sets/src/mage/cards/a/AuriokSteelshaper.java index c0c5b2df4a4..8a24978dc24 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokSteelshaper.java +++ b/Mage.Sets/src/mage/cards/a/AuriokSteelshaper.java @@ -64,8 +64,8 @@ public class AuriokSteelshaper extends CardImpl { public AuriokSteelshaper(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AuriokSunchaser.java b/Mage.Sets/src/mage/cards/a/AuriokSunchaser.java index e6701b42b0a..1fa4b66b601 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokSunchaser.java +++ b/Mage.Sets/src/mage/cards/a/AuriokSunchaser.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -54,8 +55,8 @@ public class AuriokSunchaser extends CardImpl { public AuriokSunchaser(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AuriokSurvivors.java b/Mage.Sets/src/mage/cards/a/AuriokSurvivors.java index 9d5e63cc0bb..b7a21b2c33d 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokSurvivors.java +++ b/Mage.Sets/src/mage/cards/a/AuriokSurvivors.java @@ -59,8 +59,8 @@ public class AuriokSurvivors extends CardImpl { public AuriokSurvivors(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(4); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/AuriokTransfixer.java b/Mage.Sets/src/mage/cards/a/AuriokTransfixer.java index 1262bdb0e11..08127ac249a 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokTransfixer.java +++ b/Mage.Sets/src/mage/cards/a/AuriokTransfixer.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ColoredManaSymbol; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -57,8 +58,8 @@ public class AuriokTransfixer extends CardImpl { public AuriokTransfixer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}"); - this.subtype.add("Human"); - this.subtype.add("Scout"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SCOUT); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AuriokWindwalker.java b/Mage.Sets/src/mage/cards/a/AuriokWindwalker.java index 0ae6b177c13..9d138608f2b 100644 --- a/Mage.Sets/src/mage/cards/a/AuriokWindwalker.java +++ b/Mage.Sets/src/mage/cards/a/AuriokWindwalker.java @@ -62,8 +62,8 @@ public class AuriokWindwalker extends CardImpl { public AuriokWindwalker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/Aurochs.java b/Mage.Sets/src/mage/cards/a/Aurochs.java index 19c7b32f3bb..13feb4c81ca 100644 --- a/Mage.Sets/src/mage/cards/a/Aurochs.java +++ b/Mage.Sets/src/mage/cards/a/Aurochs.java @@ -59,7 +59,7 @@ public class Aurochs extends CardImpl { public Aurochs(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); - this.subtype.add("Aurochs"); + this.subtype.add(SubType.AUROCHS); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AurochsHerd.java b/Mage.Sets/src/mage/cards/a/AurochsHerd.java index 87863f6a86a..e8882fa558e 100644 --- a/Mage.Sets/src/mage/cards/a/AurochsHerd.java +++ b/Mage.Sets/src/mage/cards/a/AurochsHerd.java @@ -65,7 +65,7 @@ public class AurochsHerd extends CardImpl { public AurochsHerd(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{G}"); - this.subtype.add("Aurochs"); + this.subtype.add(SubType.AUROCHS); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AuroraEidolon.java b/Mage.Sets/src/mage/cards/a/AuroraEidolon.java index 3311e0b4822..9e9efbb1808 100644 --- a/Mage.Sets/src/mage/cards/a/AuroraEidolon.java +++ b/Mage.Sets/src/mage/cards/a/AuroraEidolon.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.MulticoloredPredicate; @@ -60,7 +61,7 @@ public class AuroraEidolon extends CardImpl { public AuroraEidolon(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add("Spirit"); + this.subtype.add(SubType.SPIRIT); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AuroraGriffin.java b/Mage.Sets/src/mage/cards/a/AuroraGriffin.java index 93d4c1fa8e0..b05c3ee8d5e 100644 --- a/Mage.Sets/src/mage/cards/a/AuroraGriffin.java +++ b/Mage.Sets/src/mage/cards/a/AuroraGriffin.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.TargetPermanent; @@ -51,7 +52,7 @@ public class AuroraGriffin extends CardImpl { public AuroraGriffin(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add("Griffin"); + this.subtype.add(SubType.GRIFFIN); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AuroraOfEmrakul.java b/Mage.Sets/src/mage/cards/a/AuroraOfEmrakul.java index 2df86da6cbd..2b64f0ebeab 100644 --- a/Mage.Sets/src/mage/cards/a/AuroraOfEmrakul.java +++ b/Mage.Sets/src/mage/cards/a/AuroraOfEmrakul.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -46,8 +47,8 @@ public class AuroraOfEmrakul extends CardImpl { public AuroraOfEmrakul(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},""); - this.subtype.add("Eldrazi"); - this.subtype.add("Reflection"); + this.subtype.add(SubType.ELDRAZI); + this.subtype.add(SubType.REFLECTION); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AurraSingBaneOfJedi.java b/Mage.Sets/src/mage/cards/a/AurraSingBaneOfJedi.java index b59c9fd6fec..df8ad0aa9d1 100644 --- a/Mage.Sets/src/mage/cards/a/AurraSingBaneOfJedi.java +++ b/Mage.Sets/src/mage/cards/a/AurraSingBaneOfJedi.java @@ -41,6 +41,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -61,7 +62,7 @@ public class AurraSingBaneOfJedi extends CardImpl { public AurraSingBaneOfJedi(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, "{2}{B}{R}"); - this.subtype.add("Aurra"); + this.subtype.add(SubType.AURRA); this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(3)); diff --git a/Mage.Sets/src/mage/cards/a/AuspiciousAncestor.java b/Mage.Sets/src/mage/cards/a/AuspiciousAncestor.java index b3a63b297f7..dc4432d2e7f 100644 --- a/Mage.Sets/src/mage/cards/a/AuspiciousAncestor.java +++ b/Mage.Sets/src/mage/cards/a/AuspiciousAncestor.java @@ -37,6 +37,7 @@ import mage.abilities.effects.common.GainLifeEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterSpell; import mage.filter.predicate.mageobject.ColorPredicate; @@ -56,8 +57,8 @@ public class AuspiciousAncestor extends CardImpl { public AuspiciousAncestor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add("Human"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AutochthonWurm.java b/Mage.Sets/src/mage/cards/a/AutochthonWurm.java index 62c81288728..b95bfb4d0cc 100644 --- a/Mage.Sets/src/mage/cards/a/AutochthonWurm.java +++ b/Mage.Sets/src/mage/cards/a/AutochthonWurm.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,7 +45,7 @@ public class AutochthonWurm extends CardImpl { public AutochthonWurm(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{10}{G}{G}{G}{W}{W}"); - this.subtype.add("Wurm"); + this.subtype.add(SubType.WURM); this.power = new MageInt(9); diff --git a/Mage.Sets/src/mage/cards/a/AvacynAngelOfHope.java b/Mage.Sets/src/mage/cards/a/AvacynAngelOfHope.java index 87a6dafd685..7e62f6f0528 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynAngelOfHope.java +++ b/Mage.Sets/src/mage/cards/a/AvacynAngelOfHope.java @@ -36,10 +36,7 @@ import mage.abilities.keyword.IndestructibleAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterControlledPermanent; import java.util.UUID; @@ -53,7 +50,7 @@ public class AvacynAngelOfHope extends CardImpl { public AvacynAngelOfHope(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}{W}{W}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(8); this.toughness = new MageInt(8); diff --git a/Mage.Sets/src/mage/cards/a/AvacynGuardianAngel.java b/Mage.Sets/src/mage/cards/a/AvacynGuardianAngel.java index 42532c5f2ec..89bd7ecf2ba 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynGuardianAngel.java +++ b/Mage.Sets/src/mage/cards/a/AvacynGuardianAngel.java @@ -66,7 +66,7 @@ public class AvacynGuardianAngel extends CardImpl { public AvacynGuardianAngel(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}{W}"); this.addSuperType(SuperType.LEGENDARY); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AvacynThePurifier.java b/Mage.Sets/src/mage/cards/a/AvacynThePurifier.java index 82a517596fe..e818459df2a 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynThePurifier.java +++ b/Mage.Sets/src/mage/cards/a/AvacynThePurifier.java @@ -34,10 +34,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; @@ -57,7 +54,7 @@ public class AvacynThePurifier extends CardImpl { public AvacynThePurifier(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},""); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(6); this.toughness = new MageInt(5); this.color.setRed(true); diff --git a/Mage.Sets/src/mage/cards/a/AvacynianMissionaries.java b/Mage.Sets/src/mage/cards/a/AvacynianMissionaries.java index bb674c04925..08a0dea7761 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynianMissionaries.java +++ b/Mage.Sets/src/mage/cards/a/AvacynianMissionaries.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.l.LunarchInquisitors; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.TargetController; import mage.constants.Zone; @@ -49,8 +50,8 @@ public class AvacynianMissionaries extends CardImpl { public AvacynianMissionaries(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add("Human"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AvacynianPriest.java b/Mage.Sets/src/mage/cards/a/AvacynianPriest.java index 3e386e8b00a..1c70937cd9d 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynianPriest.java +++ b/Mage.Sets/src/mage/cards/a/AvacynianPriest.java @@ -58,8 +58,8 @@ public class AvacynianPriest extends CardImpl { public AvacynianPriest(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Human"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AvacynsCollar.java b/Mage.Sets/src/mage/cards/a/AvacynsCollar.java index 9f2535e3534..398418bf79d 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynsCollar.java +++ b/Mage.Sets/src/mage/cards/a/AvacynsCollar.java @@ -37,10 +37,7 @@ import mage.abilities.keyword.EquipAbility; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -58,7 +55,7 @@ public class AvacynsCollar extends CardImpl { public AvacynsCollar(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}"); - this.subtype.add("Equipment"); + this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +1/+0 and has vigilance. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 0))); diff --git a/Mage.Sets/src/mage/cards/a/AvacynsPilgrim.java b/Mage.Sets/src/mage/cards/a/AvacynsPilgrim.java index e3581b613ab..46e0b17c2b1 100644 --- a/Mage.Sets/src/mage/cards/a/AvacynsPilgrim.java +++ b/Mage.Sets/src/mage/cards/a/AvacynsPilgrim.java @@ -33,6 +33,7 @@ import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,8 +44,8 @@ public class AvacynsPilgrim extends CardImpl { public AvacynsPilgrim(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}"); - this.subtype.add("Human"); - this.subtype.add("Monk"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.MONK); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AvalancheRiders.java b/Mage.Sets/src/mage/cards/a/AvalancheRiders.java index 85a7841df0f..02917f77576 100644 --- a/Mage.Sets/src/mage/cards/a/AvalancheRiders.java +++ b/Mage.Sets/src/mage/cards/a/AvalancheRiders.java @@ -36,6 +36,7 @@ import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.target.common.TargetLandPermanent; import java.util.UUID; @@ -48,8 +49,8 @@ public class AvalancheRiders extends CardImpl { public AvalancheRiders(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); - this.subtype.add("Human"); - this.subtype.add("Nomad"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.NOMAD); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AvalancheTusker.java b/Mage.Sets/src/mage/cards/a/AvalancheTusker.java index 5ae0e544e97..536fb1dae89 100644 --- a/Mage.Sets/src/mage/cards/a/AvalancheTusker.java +++ b/Mage.Sets/src/mage/cards/a/AvalancheTusker.java @@ -34,6 +34,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerIdPredicate; @@ -51,8 +52,8 @@ public class AvalancheTusker extends CardImpl { public AvalancheTusker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{U}{R}"); - this.subtype.add("Elephant"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.ELEPHANT); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(6); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/Avarax.java b/Mage.Sets/src/mage/cards/a/Avarax.java index 49580f60aa4..3c3000d8aea 100644 --- a/Mage.Sets/src/mage/cards/a/Avarax.java +++ b/Mage.Sets/src/mage/cards/a/Avarax.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.NamePredicate; @@ -59,7 +60,7 @@ public class Avarax extends CardImpl { public Avarax(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}"); - this.subtype.add("Beast"); + this.subtype.add(SubType.BEAST); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AvariceAmulet.java b/Mage.Sets/src/mage/cards/a/AvariceAmulet.java index 19948185ce0..f6617d59f9c 100644 --- a/Mage.Sets/src/mage/cards/a/AvariceAmulet.java +++ b/Mage.Sets/src/mage/cards/a/AvariceAmulet.java @@ -56,7 +56,7 @@ public class AvariceAmulet extends CardImpl { public AvariceAmulet(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}"); - this.subtype.add("Equipment"); + this.subtype.add(SubType.EQUIPMENT); // Equipped creature gets +2/+0 Effect effect = new BoostEquippedEffect(2, 0); diff --git a/Mage.Sets/src/mage/cards/a/AvariciousDragon.java b/Mage.Sets/src/mage/cards/a/AvariciousDragon.java index e060c48b1f5..db81b3dbc1f 100644 --- a/Mage.Sets/src/mage/cards/a/AvariciousDragon.java +++ b/Mage.Sets/src/mage/cards/a/AvariciousDragon.java @@ -36,6 +36,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.TargetController; import java.util.UUID; @@ -48,7 +49,7 @@ public class AvariciousDragon extends CardImpl { public AvariciousDragon(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); - this.subtype.add("Dragon"); + this.subtype.add(SubType.DRAGON); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AvatarOfDiscord.java b/Mage.Sets/src/mage/cards/a/AvatarOfDiscord.java index f59f6e4c43f..abe6f137bc2 100644 --- a/Mage.Sets/src/mage/cards/a/AvatarOfDiscord.java +++ b/Mage.Sets/src/mage/cards/a/AvatarOfDiscord.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterCard; import mage.target.common.TargetCardInHand; @@ -48,7 +49,7 @@ public class AvatarOfDiscord extends CardImpl { public AvatarOfDiscord(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B/R}{B/R}{B/R}"); - this.subtype.add("Avatar"); + this.subtype.add(SubType.AVATAR); this.power = new MageInt(5); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AvatarOfFury.java b/Mage.Sets/src/mage/cards/a/AvatarOfFury.java index af69045b85c..d2138f65ff9 100644 --- a/Mage.Sets/src/mage/cards/a/AvatarOfFury.java +++ b/Mage.Sets/src/mage/cards/a/AvatarOfFury.java @@ -40,6 +40,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.filter.common.FilterLandPermanent; @@ -56,7 +57,7 @@ public class AvatarOfFury extends CardImpl { public AvatarOfFury(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{6}{R}{R}"); - this.subtype.add("Avatar"); + this.subtype.add(SubType.AVATAR); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/AvatarOfHope.java b/Mage.Sets/src/mage/cards/a/AvatarOfHope.java index e6b82995be2..05b23b0d3bb 100644 --- a/Mage.Sets/src/mage/cards/a/AvatarOfHope.java +++ b/Mage.Sets/src/mage/cards/a/AvatarOfHope.java @@ -54,7 +54,7 @@ public class AvatarOfHope extends CardImpl { public AvatarOfHope(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{6}{W}{W}"); - this.subtype.add("Avatar"); + this.subtype.add(SubType.AVATAR); this.power = new MageInt(4); this.toughness = new MageInt(9); diff --git a/Mage.Sets/src/mage/cards/a/AvatarOfMight.java b/Mage.Sets/src/mage/cards/a/AvatarOfMight.java index 8aabae5293c..c47d6642df9 100644 --- a/Mage.Sets/src/mage/cards/a/AvatarOfMight.java +++ b/Mage.Sets/src/mage/cards/a/AvatarOfMight.java @@ -51,7 +51,7 @@ public class AvatarOfMight extends CardImpl { public AvatarOfMight(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{6}{G}{G}"); - this.subtype.add("Avatar"); + this.subtype.add(SubType.AVATAR); this.power = new MageInt(8); this.toughness = new MageInt(8); diff --git a/Mage.Sets/src/mage/cards/a/AvatarOfSlaughter.java b/Mage.Sets/src/mage/cards/a/AvatarOfSlaughter.java index 10bd790284f..56f055b8f30 100644 --- a/Mage.Sets/src/mage/cards/a/AvatarOfSlaughter.java +++ b/Mage.Sets/src/mage/cards/a/AvatarOfSlaughter.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -39,10 +38,14 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; -import static mage.filter.StaticFilters.FILTER_PERMANENT_CREATURES; import mage.watchers.common.AttackedThisTurnWatcher; +import java.util.UUID; + +import static mage.filter.StaticFilters.FILTER_PERMANENT_CREATURES; + /** * * @author fireshoes @@ -51,7 +54,7 @@ public class AvatarOfSlaughter extends CardImpl { public AvatarOfSlaughter(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{6}{R}{R}"); - this.subtype.add("Avatar"); + this.subtype.add(SubType.AVATAR); this.power = new MageInt(8); this.toughness = new MageInt(8); diff --git a/Mage.Sets/src/mage/cards/a/AvatarOfTheResolute.java b/Mage.Sets/src/mage/cards/a/AvatarOfTheResolute.java index 7ec0c4ad1da..6fd203b9c6e 100644 --- a/Mage.Sets/src/mage/cards/a/AvatarOfTheResolute.java +++ b/Mage.Sets/src/mage/cards/a/AvatarOfTheResolute.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.permanent.AnotherPredicate; @@ -59,7 +60,7 @@ public class AvatarOfTheResolute extends CardImpl { public AvatarOfTheResolute(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}{G}"); - this.subtype.add("Avatar"); + this.subtype.add(SubType.AVATAR); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AvatarOfWill.java b/Mage.Sets/src/mage/cards/a/AvatarOfWill.java index b25b998670a..050217b5700 100644 --- a/Mage.Sets/src/mage/cards/a/AvatarOfWill.java +++ b/Mage.Sets/src/mage/cards/a/AvatarOfWill.java @@ -50,7 +50,7 @@ public class AvatarOfWill extends CardImpl { public AvatarOfWill(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{6}{U}{U}"); - this.subtype.add("Avatar"); + this.subtype.add(SubType.AVATAR); this.power = new MageInt(5); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/a/AvatarOfWoe.java b/Mage.Sets/src/mage/cards/a/AvatarOfWoe.java index 23532d26ac8..6404e0a09c8 100644 --- a/Mage.Sets/src/mage/cards/a/AvatarOfWoe.java +++ b/Mage.Sets/src/mage/cards/a/AvatarOfWoe.java @@ -55,7 +55,7 @@ public class AvatarOfWoe extends CardImpl { public AvatarOfWoe(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{6}{B}{B}"); - this.subtype.add("Avatar"); + this.subtype.add(SubType.AVATAR); this.power = new MageInt(6); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AvenArcher.java b/Mage.Sets/src/mage/cards/a/AvenArcher.java index e1a1586f655..2f97d43f6e0 100644 --- a/Mage.Sets/src/mage/cards/a/AvenArcher.java +++ b/Mage.Sets/src/mage/cards/a/AvenArcher.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetAttackingOrBlockingCreature; @@ -50,9 +51,9 @@ public class AvenArcher extends CardImpl { public AvenArcher(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}"); - this.subtype.add("Bird"); - this.subtype.add("Soldier"); - this.subtype.add("Archer"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.SOLDIER); + this.subtype.add(SubType.ARCHER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AvenAugur.java b/Mage.Sets/src/mage/cards/a/AvenAugur.java index 13dcd0f1d56..fb93036320b 100644 --- a/Mage.Sets/src/mage/cards/a/AvenAugur.java +++ b/Mage.Sets/src/mage/cards/a/AvenAugur.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.PhaseStep; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetCreaturePermanent; @@ -51,8 +52,8 @@ public class AvenAugur extends CardImpl { public AvenAugur(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}"); - this.subtype.add("Bird"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AvenBattlePriest.java b/Mage.Sets/src/mage/cards/a/AvenBattlePriest.java index 6822618ec6c..a4e00f4f066 100644 --- a/Mage.Sets/src/mage/cards/a/AvenBattlePriest.java +++ b/Mage.Sets/src/mage/cards/a/AvenBattlePriest.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,8 +46,8 @@ public class AvenBattlePriest extends CardImpl { public AvenBattlePriest(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{W}"); - this.subtype.add("Bird"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AvenBrigadier.java b/Mage.Sets/src/mage/cards/a/AvenBrigadier.java index 29c830979a8..1792eb1e227 100644 --- a/Mage.Sets/src/mage/cards/a/AvenBrigadier.java +++ b/Mage.Sets/src/mage/cards/a/AvenBrigadier.java @@ -58,8 +58,8 @@ public class AvenBrigadier extends CardImpl { public AvenBrigadier(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}{W}"); - this.subtype.add("Bird"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AvenCloudchaser.java b/Mage.Sets/src/mage/cards/a/AvenCloudchaser.java index a34cd1bfb35..6ed9a73f258 100644 --- a/Mage.Sets/src/mage/cards/a/AvenCloudchaser.java +++ b/Mage.Sets/src/mage/cards/a/AvenCloudchaser.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.target.common.TargetEnchantmentPermanent; import java.util.UUID; @@ -47,8 +48,8 @@ public class AvenCloudchaser extends CardImpl { public AvenCloudchaser(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add("Bird"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AvenEnvoy.java b/Mage.Sets/src/mage/cards/a/AvenEnvoy.java index 5be8f054087..7f55a7909ea 100644 --- a/Mage.Sets/src/mage/cards/a/AvenEnvoy.java +++ b/Mage.Sets/src/mage/cards/a/AvenEnvoy.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,8 +44,8 @@ public class AvenEnvoy extends CardImpl { public AvenEnvoy(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{U}"); - this.subtype.add("Bird"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(0); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AvenFarseer.java b/Mage.Sets/src/mage/cards/a/AvenFarseer.java index fb869c6ab5a..fa9ca02dd6b 100644 --- a/Mage.Sets/src/mage/cards/a/AvenFarseer.java +++ b/Mage.Sets/src/mage/cards/a/AvenFarseer.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.FilterPermanent; @@ -47,8 +48,8 @@ public class AvenFarseer extends CardImpl { public AvenFarseer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Bird"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AvenFateshaper.java b/Mage.Sets/src/mage/cards/a/AvenFateshaper.java index 59d6f19d5c3..d4970eb5301 100644 --- a/Mage.Sets/src/mage/cards/a/AvenFateshaper.java +++ b/Mage.Sets/src/mage/cards/a/AvenFateshaper.java @@ -36,6 +36,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -48,8 +49,8 @@ public class AvenFateshaper extends CardImpl { public AvenFateshaper(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{6}{U}"); - this.subtype.add("Bird"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(4); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AvenFisher.java b/Mage.Sets/src/mage/cards/a/AvenFisher.java index 4442dfd403c..6582ab1dbd6 100644 --- a/Mage.Sets/src/mage/cards/a/AvenFisher.java +++ b/Mage.Sets/src/mage/cards/a/AvenFisher.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,8 +46,8 @@ public class AvenFisher extends CardImpl { public AvenFisher(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}"); - this.subtype.add("Bird"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AvenFleetwing.java b/Mage.Sets/src/mage/cards/a/AvenFleetwing.java index 036991217fa..5a25254fe55 100644 --- a/Mage.Sets/src/mage/cards/a/AvenFleetwing.java +++ b/Mage.Sets/src/mage/cards/a/AvenFleetwing.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,8 +45,8 @@ public class AvenFleetwing extends CardImpl { public AvenFleetwing(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}"); - this.subtype.add("Bird"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AvenFlock.java b/Mage.Sets/src/mage/cards/a/AvenFlock.java index 4fbdbb19b04..94aa78c8cb1 100644 --- a/Mage.Sets/src/mage/cards/a/AvenFlock.java +++ b/Mage.Sets/src/mage/cards/a/AvenFlock.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -48,8 +49,8 @@ public class AvenFlock extends CardImpl { public AvenFlock(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}"); - this.subtype.add("Bird"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AvenFogbringer.java b/Mage.Sets/src/mage/cards/a/AvenFogbringer.java index b202bd3bf10..559ce0d78b0 100644 --- a/Mage.Sets/src/mage/cards/a/AvenFogbringer.java +++ b/Mage.Sets/src/mage/cards/a/AvenFogbringer.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.target.common.TargetLandPermanent; import java.util.UUID; @@ -47,8 +48,8 @@ public class AvenFogbringer extends CardImpl { public AvenFogbringer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}"); - this.subtype.add("Bird"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AvenInitiate.java b/Mage.Sets/src/mage/cards/a/AvenInitiate.java index 9bb4a995c04..886819e0e81 100644 --- a/Mage.Sets/src/mage/cards/a/AvenInitiate.java +++ b/Mage.Sets/src/mage/cards/a/AvenInitiate.java @@ -27,14 +27,16 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; -import mage.abilities.keyword.FlyingAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.keyword.EmbalmAbility; +import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -45,8 +47,8 @@ public class AvenInitiate extends CardImpl { public AvenInitiate(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}"); - this.subtype.add("Bird"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AvenLiberator.java b/Mage.Sets/src/mage/cards/a/AvenLiberator.java index 321bff9aa84..2f3ce6720a2 100644 --- a/Mage.Sets/src/mage/cards/a/AvenLiberator.java +++ b/Mage.Sets/src/mage/cards/a/AvenLiberator.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.target.common.TargetControlledCreaturePermanent; import java.util.UUID; @@ -50,8 +51,8 @@ public class AvenLiberator extends CardImpl { public AvenLiberator(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}"); - this.subtype.add("Bird"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AvenMimeomancer.java b/Mage.Sets/src/mage/cards/a/AvenMimeomancer.java index a42ca844de7..d693cff6c5e 100644 --- a/Mage.Sets/src/mage/cards/a/AvenMimeomancer.java +++ b/Mage.Sets/src/mage/cards/a/AvenMimeomancer.java @@ -52,8 +52,8 @@ public class AvenMimeomancer extends CardImpl { public AvenMimeomancer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{U}"); - this.subtype.add("Bird"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.WIZARD); diff --git a/Mage.Sets/src/mage/cards/a/AvenMindcensor.java b/Mage.Sets/src/mage/cards/a/AvenMindcensor.java index 75d1d4ba01b..0c4a0dc8508 100644 --- a/Mage.Sets/src/mage/cards/a/AvenMindcensor.java +++ b/Mage.Sets/src/mage/cards/a/AvenMindcensor.java @@ -35,10 +35,7 @@ import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.players.Player; @@ -53,8 +50,8 @@ public class AvenMindcensor extends CardImpl { public AvenMindcensor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.subtype.add("Bird"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AvenOfEnduringHope.java b/Mage.Sets/src/mage/cards/a/AvenOfEnduringHope.java index a7d3516bc04..634bd495833 100644 --- a/Mage.Sets/src/mage/cards/a/AvenOfEnduringHope.java +++ b/Mage.Sets/src/mage/cards/a/AvenOfEnduringHope.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; @@ -35,6 +34,9 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -45,8 +47,8 @@ public class AvenOfEnduringHope extends CardImpl { public AvenOfEnduringHope(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{W}"); - this.subtype.add("Bird"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AvenRedeemer.java b/Mage.Sets/src/mage/cards/a/AvenRedeemer.java index 23d64cccd55..855f5649a69 100644 --- a/Mage.Sets/src/mage/cards/a/AvenRedeemer.java +++ b/Mage.Sets/src/mage/cards/a/AvenRedeemer.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetCreatureOrPlayer; @@ -50,8 +51,8 @@ public class AvenRedeemer extends CardImpl { public AvenRedeemer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add("Bird"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AvenReedstalker.java b/Mage.Sets/src/mage/cards/a/AvenReedstalker.java index f64907deb90..6dfa2419f24 100644 --- a/Mage.Sets/src/mage/cards/a/AvenReedstalker.java +++ b/Mage.Sets/src/mage/cards/a/AvenReedstalker.java @@ -27,13 +27,15 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; + +import java.util.UUID; /** * @@ -44,8 +46,8 @@ public class AvenReedstalker extends CardImpl { public AvenReedstalker(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}"); - this.subtype.add("Bird"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AvenRiftwatcher.java b/Mage.Sets/src/mage/cards/a/AvenRiftwatcher.java index 9561da86edc..c52453280de 100644 --- a/Mage.Sets/src/mage/cards/a/AvenRiftwatcher.java +++ b/Mage.Sets/src/mage/cards/a/AvenRiftwatcher.java @@ -39,6 +39,7 @@ import mage.abilities.keyword.VanishingUpkeepAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.counters.CounterType; import java.util.UUID; @@ -51,9 +52,9 @@ public class AvenRiftwatcher extends CardImpl { public AvenRiftwatcher(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.subtype.add("Bird"); - this.subtype.add("Rebel"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.REBEL); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AvenSkirmisher.java b/Mage.Sets/src/mage/cards/a/AvenSkirmisher.java index 7e006e967ed..7e6576276cf 100644 --- a/Mage.Sets/src/mage/cards/a/AvenSkirmisher.java +++ b/Mage.Sets/src/mage/cards/a/AvenSkirmisher.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,8 +44,8 @@ public class AvenSkirmisher extends CardImpl { public AvenSkirmisher(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}"); - this.subtype.add("Bird"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AvenSmokeweaver.java b/Mage.Sets/src/mage/cards/a/AvenSmokeweaver.java index 8e19bffe4ca..388b7ba3de4 100644 --- a/Mage.Sets/src/mage/cards/a/AvenSmokeweaver.java +++ b/Mage.Sets/src/mage/cards/a/AvenSmokeweaver.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,8 +46,8 @@ public class AvenSmokeweaver extends CardImpl { public AvenSmokeweaver(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}"); - this.subtype.add("Bird"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AvenSoulgazer.java b/Mage.Sets/src/mage/cards/a/AvenSoulgazer.java index 1175fe19e4a..17e59d4b903 100644 --- a/Mage.Sets/src/mage/cards/a/AvenSoulgazer.java +++ b/Mage.Sets/src/mage/cards/a/AvenSoulgazer.java @@ -40,6 +40,7 @@ import mage.cards.Cards; import mage.cards.CardsImpl; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.other.FaceDownPredicate; @@ -64,8 +65,8 @@ public class AvenSoulgazer extends CardImpl { public AvenSoulgazer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}"); - this.subtype.add("Bird"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AvenSquire.java b/Mage.Sets/src/mage/cards/a/AvenSquire.java index d8a2114cafd..c515c228ceb 100644 --- a/Mage.Sets/src/mage/cards/a/AvenSquire.java +++ b/Mage.Sets/src/mage/cards/a/AvenSquire.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,8 +46,8 @@ public class AvenSquire extends CardImpl { public AvenSquire(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Bird"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(1); this.toughness = new MageInt(1); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/cards/a/AvenSunstriker.java b/Mage.Sets/src/mage/cards/a/AvenSunstriker.java index 1f2a3beff91..b6d100f796d 100644 --- a/Mage.Sets/src/mage/cards/a/AvenSunstriker.java +++ b/Mage.Sets/src/mage/cards/a/AvenSunstriker.java @@ -35,6 +35,7 @@ import mage.abilities.keyword.MorphAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -46,8 +47,8 @@ public class AvenSunstriker extends CardImpl { public AvenSunstriker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{W}"); - this.subtype.add("Bird"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AvenSurveyor.java b/Mage.Sets/src/mage/cards/a/AvenSurveyor.java index 1edb4ec785a..9f45b159d10 100644 --- a/Mage.Sets/src/mage/cards/a/AvenSurveyor.java +++ b/Mage.Sets/src/mage/cards/a/AvenSurveyor.java @@ -37,6 +37,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.counters.CounterType; import mage.target.common.TargetCreaturePermanent; @@ -50,8 +51,8 @@ public class AvenSurveyor extends CardImpl { public AvenSurveyor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{U}"); - this.subtype.add("Bird"); - this.subtype.add("Scout"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.SCOUT); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AvenTactician.java b/Mage.Sets/src/mage/cards/a/AvenTactician.java index d40242599d0..85cf56b122d 100644 --- a/Mage.Sets/src/mage/cards/a/AvenTactician.java +++ b/Mage.Sets/src/mage/cards/a/AvenTactician.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,8 +46,8 @@ public class AvenTactician extends CardImpl { public AvenTactician(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}"); - this.subtype.add("Bird"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AvenTrailblazer.java b/Mage.Sets/src/mage/cards/a/AvenTrailblazer.java index 11c9dd63d98..47228051657 100644 --- a/Mage.Sets/src/mage/cards/a/AvenTrailblazer.java +++ b/Mage.Sets/src/mage/cards/a/AvenTrailblazer.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -48,8 +49,8 @@ public class AvenTrailblazer extends CardImpl { public AvenTrailblazer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.subtype.add("Bird"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/a/AvenTrooper.java b/Mage.Sets/src/mage/cards/a/AvenTrooper.java index 1731c930941..21ae14335c5 100644 --- a/Mage.Sets/src/mage/cards/a/AvenTrooper.java +++ b/Mage.Sets/src/mage/cards/a/AvenTrooper.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -50,8 +51,8 @@ public class AvenTrooper extends CardImpl { public AvenTrooper(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add("Bird"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AvenWarhawk.java b/Mage.Sets/src/mage/cards/a/AvenWarhawk.java index 4609789259a..3fcc1dc78f7 100644 --- a/Mage.Sets/src/mage/cards/a/AvenWarhawk.java +++ b/Mage.Sets/src/mage/cards/a/AvenWarhawk.java @@ -34,6 +34,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,8 +46,8 @@ public class AvenWarhawk extends CardImpl { public AvenWarhawk(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}"); - this.subtype.add("Bird"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AvenWindGuide.java b/Mage.Sets/src/mage/cards/a/AvenWindGuide.java index e308e67ceb0..cff2629e09b 100644 --- a/Mage.Sets/src/mage/cards/a/AvenWindGuide.java +++ b/Mage.Sets/src/mage/cards/a/AvenWindGuide.java @@ -27,23 +27,25 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; -import mage.abilities.keyword.FlyingAbility; -import mage.abilities.keyword.VigilanceAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.Effect; +import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.EmbalmAbility; +import mage.abilities.keyword.FlyingAbility; +import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.StaticFilters; +import java.util.UUID; + /** * * @author stravant @@ -53,8 +55,8 @@ public class AvenWindGuide extends CardImpl { public AvenWindGuide(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}{U}"); - this.subtype.add("Bird"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AvenWindreader.java b/Mage.Sets/src/mage/cards/a/AvenWindreader.java index e933b0b773e..b30538ba861 100644 --- a/Mage.Sets/src/mage/cards/a/AvenWindreader.java +++ b/Mage.Sets/src/mage/cards/a/AvenWindreader.java @@ -36,6 +36,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.TargetPlayer; @@ -49,9 +50,9 @@ public class AvenWindreader extends CardImpl { public AvenWindreader(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}{U}"); - this.subtype.add("Bird"); - this.subtype.add("Soldier"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.BIRD); + this.subtype.add(SubType.SOLDIER); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AvengerEnDal.java b/Mage.Sets/src/mage/cards/a/AvengerEnDal.java index f188e83566e..245f2d5c778 100644 --- a/Mage.Sets/src/mage/cards/a/AvengerEnDal.java +++ b/Mage.Sets/src/mage/cards/a/AvengerEnDal.java @@ -39,6 +39,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; @@ -55,8 +56,8 @@ public class AvengerEnDal extends CardImpl { public AvengerEnDal(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Human"); - this.subtype.add("Spellshaper"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SPELLSHAPER); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AvengerOfZendikar.java b/Mage.Sets/src/mage/cards/a/AvengerOfZendikar.java index 1de50c28637..5e740c073d3 100644 --- a/Mage.Sets/src/mage/cards/a/AvengerOfZendikar.java +++ b/Mage.Sets/src/mage/cards/a/AvengerOfZendikar.java @@ -62,7 +62,7 @@ public class AvengerOfZendikar extends CardImpl { public AvengerOfZendikar (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{G}{G}"); - this.subtype.add("Elemental"); + this.subtype.add(SubType.ELEMENTAL); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AvengingAngel.java b/Mage.Sets/src/mage/cards/a/AvengingAngel.java index 743fbc3e03d..49941a44ce7 100644 --- a/Mage.Sets/src/mage/cards/a/AvengingAngel.java +++ b/Mage.Sets/src/mage/cards/a/AvengingAngel.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; @@ -51,7 +52,7 @@ public class AvengingAngel extends CardImpl { public AvengingAngel(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{W}"); - this.subtype.add("Angel"); + this.subtype.add(SubType.ANGEL); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AvengingDruid.java b/Mage.Sets/src/mage/cards/a/AvengingDruid.java index 7ea9174674f..81885292daa 100644 --- a/Mage.Sets/src/mage/cards/a/AvengingDruid.java +++ b/Mage.Sets/src/mage/cards/a/AvengingDruid.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.RevealCardsFromLibraryUntilEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterLandCard; @@ -47,8 +48,8 @@ public class AvengingDruid extends CardImpl { public AvengingDruid(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}"); - this.subtype.add("Human"); - this.subtype.add("Druid"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.DRUID); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AvianChangeling.java b/Mage.Sets/src/mage/cards/a/AvianChangeling.java index 6d985e28f79..794614b95b8 100644 --- a/Mage.Sets/src/mage/cards/a/AvianChangeling.java +++ b/Mage.Sets/src/mage/cards/a/AvianChangeling.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -44,7 +45,7 @@ public class AvianChangeling extends CardImpl { public AvianChangeling(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.subtype.add("Shapeshifter"); + this.subtype.add(SubType.SHAPESHIFTER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AviaryMechanic.java b/Mage.Sets/src/mage/cards/a/AviaryMechanic.java index aea2cb144b9..6de82915dbe 100644 --- a/Mage.Sets/src/mage/cards/a/AviaryMechanic.java +++ b/Mage.Sets/src/mage/cards/a/AviaryMechanic.java @@ -33,6 +33,7 @@ import mage.abilities.effects.common.ReturnToHandChosenControlledPermanentEffect import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.permanent.AnotherPredicate; @@ -52,8 +53,8 @@ public class AviaryMechanic extends CardImpl { public AviaryMechanic(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Dwarf"); - this.subtype.add("Artificer"); + this.subtype.add(SubType.DWARF); + this.subtype.add(SubType.ARTIFICER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AvidReclaimer.java b/Mage.Sets/src/mage/cards/a/AvidReclaimer.java index 4c6636d9848..aca5ff1d1f5 100644 --- a/Mage.Sets/src/mage/cards/a/AvidReclaimer.java +++ b/Mage.Sets/src/mage/cards/a/AvidReclaimer.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; @@ -43,6 +42,8 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.filter.predicate.mageobject.SubtypePredicate; +import java.util.UUID; + /** * * @author spjspj @@ -59,8 +60,8 @@ public class AvidReclaimer extends CardImpl { public AvidReclaimer(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}"); - this.subtype.add("Human"); - this.subtype.add("Druid"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.DRUID); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/Avizoa.java b/Mage.Sets/src/mage/cards/a/Avizoa.java index f53c7bed819..b4b07cada09 100644 --- a/Mage.Sets/src/mage/cards/a/Avizoa.java +++ b/Mage.Sets/src/mage/cards/a/Avizoa.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -51,7 +52,7 @@ public class Avizoa extends CardImpl { public Avizoa(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}"); - this.subtype.add("Jellyfish"); + this.subtype.add(SubType.JELLYFISH); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java b/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java index a3c6e9c1da5..27a3456dfdc 100644 --- a/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java +++ b/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java @@ -54,7 +54,7 @@ public class AwakenTheAncient extends CardImpl { public AwakenTheAncient(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{R}{R}{R}"); - this.subtype.add("Aura"); + this.subtype.add(SubType.AURA); // Enchant Mountain @@ -85,7 +85,7 @@ public class AwakenTheAncient extends CardImpl { super("Giant", "7/7 red Giant creature with haste"); cardType.add(CardType.CREATURE); color.setRed(true); - subtype.add("Giant"); + subtype.add(SubType.GIANT); power = new MageInt(7); toughness = new MageInt(7); this.addAbility(HasteAbility.getInstance()); diff --git a/Mage.Sets/src/mage/cards/a/AwakenerDruid.java b/Mage.Sets/src/mage/cards/a/AwakenerDruid.java index cd02f2b0da5..d6dfe59a644 100644 --- a/Mage.Sets/src/mage/cards/a/AwakenerDruid.java +++ b/Mage.Sets/src/mage/cards/a/AwakenerDruid.java @@ -55,8 +55,8 @@ public class AwakenerDruid extends CardImpl { public AwakenerDruid(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); - this.subtype.add("Human"); - this.subtype.add("Druid"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.DRUID); this.power = new MageInt(1); this.toughness = new MageInt(1); @@ -113,7 +113,7 @@ class AwakenerDruidToken extends Token { public AwakenerDruidToken() { super("", "4/5 green Treefolk creature as long as {this} is on the battlefield"); cardType.add(CardType.CREATURE); - subtype.add("Treefolk"); + subtype.add(SubType.TREEFOLK); color.setGreen(true); power = new MageInt(4); toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/a/AwokenHorror.java b/Mage.Sets/src/mage/cards/a/AwokenHorror.java index fcf1591a300..2f088de7904 100644 --- a/Mage.Sets/src/mage/cards/a/AwokenHorror.java +++ b/Mage.Sets/src/mage/cards/a/AwokenHorror.java @@ -52,8 +52,8 @@ public class AwokenHorror extends CardImpl { public AwokenHorror(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},""); - this.subtype.add("Kraken"); - this.subtype.add("Horror"); + this.subtype.add(SubType.KRAKEN); + this.subtype.add(SubType.HORROR); this.power = new MageInt(7); this.toughness = new MageInt(8); this.color.setBlue(true); diff --git a/Mage.Sets/src/mage/cards/a/AxebaneGuardian.java b/Mage.Sets/src/mage/cards/a/AxebaneGuardian.java index d158db9192f..ba495c71822 100644 --- a/Mage.Sets/src/mage/cards/a/AxebaneGuardian.java +++ b/Mage.Sets/src/mage/cards/a/AxebaneGuardian.java @@ -35,6 +35,7 @@ import mage.abilities.mana.DynamicManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.FilterPermanent; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; @@ -55,8 +56,8 @@ public class AxebaneGuardian extends CardImpl { public AxebaneGuardian(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); - this.subtype.add("Human"); - this.subtype.add("Druid"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.DRUID); this.power = new MageInt(0); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AxebaneStag.java b/Mage.Sets/src/mage/cards/a/AxebaneStag.java index 1fe8546fa4c..11a3759de01 100644 --- a/Mage.Sets/src/mage/cards/a/AxebaneStag.java +++ b/Mage.Sets/src/mage/cards/a/AxebaneStag.java @@ -31,6 +31,7 @@ import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -42,7 +43,7 @@ public class AxebaneStag extends CardImpl { public AxebaneStag(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{6}{G}"); - this.subtype.add("Elk"); + this.subtype.add(SubType.ELK); this.power = new MageInt(6); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/a/AxegrinderGiant.java b/Mage.Sets/src/mage/cards/a/AxegrinderGiant.java index b94c5404f5c..57a95b9091f 100644 --- a/Mage.Sets/src/mage/cards/a/AxegrinderGiant.java +++ b/Mage.Sets/src/mage/cards/a/AxegrinderGiant.java @@ -31,6 +31,7 @@ import mage.MageInt; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -42,8 +43,8 @@ public class AxegrinderGiant extends CardImpl { public AxegrinderGiant(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}{R}"); - this.subtype.add("Giant"); - this.subtype.add("Warrior"); + this.subtype.add(SubType.GIANT); + this.subtype.add(SubType.WARRIOR); this.power = new MageInt(6); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AyliEternalPilgrim.java b/Mage.Sets/src/mage/cards/a/AyliEternalPilgrim.java index a65a9c45244..2844b5a832c 100644 --- a/Mage.Sets/src/mage/cards/a/AyliEternalPilgrim.java +++ b/Mage.Sets/src/mage/cards/a/AyliEternalPilgrim.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -44,6 +43,7 @@ import mage.abilities.keyword.DeathtouchAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; import mage.constants.Zone; import mage.filter.StaticFilters; @@ -52,6 +52,8 @@ import mage.players.Player; import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetNonlandPermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -61,8 +63,8 @@ public class AyliEternalPilgrim extends CardImpl { public AyliEternalPilgrim(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{W}{B}"); this.addSuperType(SuperType.LEGENDARY); - this.subtype.add("Kor"); - this.subtype.add("Cleric"); + this.subtype.add(SubType.KOR); + this.subtype.add(SubType.CLERIC); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AysenBureaucrats.java b/Mage.Sets/src/mage/cards/a/AysenBureaucrats.java index 8a444ac5b19..b7543df57a9 100644 --- a/Mage.Sets/src/mage/cards/a/AysenBureaucrats.java +++ b/Mage.Sets/src/mage/cards/a/AysenBureaucrats.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.PowerPredicate; @@ -57,8 +58,8 @@ public class AysenBureaucrats extends CardImpl { public AysenBureaucrats(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Human"); - this.subtype.add("Advisor"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.ADVISOR); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AyumiTheLastVisitor.java b/Mage.Sets/src/mage/cards/a/AyumiTheLastVisitor.java index 19d6dd6392e..06f2812affd 100644 --- a/Mage.Sets/src/mage/cards/a/AyumiTheLastVisitor.java +++ b/Mage.Sets/src/mage/cards/a/AyumiTheLastVisitor.java @@ -32,6 +32,7 @@ import mage.abilities.keyword.LandwalkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.mageobject.SupertypePredicate; @@ -52,7 +53,7 @@ public class AyumiTheLastVisitor extends CardImpl { public AyumiTheLastVisitor(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{G}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Spirit"); + this.subtype.add(SubType.SPIRIT); this.power = new MageInt(7); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AzamiLadyOfScrolls.java b/Mage.Sets/src/mage/cards/a/AzamiLadyOfScrolls.java index c74c37d5da5..a20f336399e 100644 --- a/Mage.Sets/src/mage/cards/a/AzamiLadyOfScrolls.java +++ b/Mage.Sets/src/mage/cards/a/AzamiLadyOfScrolls.java @@ -61,8 +61,8 @@ public class AzamiLadyOfScrolls extends CardImpl { public AzamiLadyOfScrolls(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}{U}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(0); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AzimaetDrake.java b/Mage.Sets/src/mage/cards/a/AzimaetDrake.java index ad787caabcd..8078b7790f2 100644 --- a/Mage.Sets/src/mage/cards/a/AzimaetDrake.java +++ b/Mage.Sets/src/mage/cards/a/AzimaetDrake.java @@ -36,6 +36,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -48,7 +49,7 @@ public class AzimaetDrake extends CardImpl { public AzimaetDrake(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}"); - this.subtype.add("Drake"); + this.subtype.add(SubType.DRAKE); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AzoriusAEthermage.java b/Mage.Sets/src/mage/cards/a/AzoriusAEthermage.java index 327c7b57285..1621c39a31f 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusAEthermage.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusAEthermage.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.game.Game; @@ -56,8 +57,8 @@ public class AzoriusAEthermage extends CardImpl { public AzoriusAEthermage(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}{U}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AzoriusArrester.java b/Mage.Sets/src/mage/cards/a/AzoriusArrester.java index 10eeea8c6c4..765f9378bae 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusArrester.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusArrester.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.DetainTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -55,8 +56,8 @@ public class AzoriusArrester extends CardImpl { public AzoriusArrester(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add("Human"); - this.subtype.add("Soldier"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AzoriusFirstWing.java b/Mage.Sets/src/mage/cards/a/AzoriusFirstWing.java index 3c8a33808bf..8154b608ba1 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusFirstWing.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusFirstWing.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.ProtectionAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.filter.common.FilterEnchantmentCard; import java.util.UUID; @@ -46,7 +47,7 @@ public class AzoriusFirstWing extends CardImpl { public AzoriusFirstWing(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}{U}"); - this.subtype.add("Griffin"); + this.subtype.add(SubType.GRIFFIN); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AzoriusGuildgate.java b/Mage.Sets/src/mage/cards/a/AzoriusGuildgate.java index da16de069d7..c349ece5cf5 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusGuildgate.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusGuildgate.java @@ -33,6 +33,7 @@ import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -43,7 +44,7 @@ public class AzoriusGuildgate extends CardImpl { public AzoriusGuildgate(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.LAND},""); - this.subtype.add("Gate"); + this.subtype.add(SubType.GATE); // Azorius Guildgate enters the battlefield tapped. this.addAbility(new EntersBattlefieldTappedAbility()); diff --git a/Mage.Sets/src/mage/cards/a/AzoriusGuildmage.java b/Mage.Sets/src/mage/cards/a/AzoriusGuildmage.java index dccf78fba7d..f8b87a418b3 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusGuildmage.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusGuildmage.java @@ -36,6 +36,7 @@ import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import mage.target.common.TargetActivatedAbility; import mage.target.common.TargetCreaturePermanent; @@ -50,8 +51,8 @@ public class AzoriusGuildmage extends CardImpl { public AzoriusGuildmage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W/U}{W/U}"); - this.subtype.add("Vedalken"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.VEDALKEN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AzoriusHerald.java b/Mage.Sets/src/mage/cards/a/AzoriusHerald.java index dca809bc52b..7a672e61b27 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusHerald.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusHerald.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ColoredManaSymbol; +import mage.constants.SubType; import mage.watchers.common.ManaSpentToCastWatcher; import java.util.UUID; @@ -49,7 +50,7 @@ public class AzoriusHerald extends CardImpl { public AzoriusHerald(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.subtype.add("Spirit"); + this.subtype.add(SubType.SPIRIT); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AzoriusJusticiar.java b/Mage.Sets/src/mage/cards/a/AzoriusJusticiar.java index f91a365f636..ea0087911aa 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusJusticiar.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusJusticiar.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.DetainTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; @@ -55,8 +56,8 @@ public class AzoriusJusticiar extends CardImpl { public AzoriusJusticiar(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}{W}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AzoriusKeyrune.java b/Mage.Sets/src/mage/cards/a/AzoriusKeyrune.java index 7617d1ef68b..ebbdfd36879 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusKeyrune.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusKeyrune.java @@ -38,6 +38,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.permanent.token.Token; @@ -75,7 +76,7 @@ public class AzoriusKeyrune extends CardImpl { cardType.add(CardType.CREATURE); color.setWhite(true); color.setBlue(true); - this.subtype.add("Bird"); + this.subtype.add(SubType.BIRD); power = new MageInt(2); toughness = new MageInt(2); this.addAbility(FlyingAbility.getInstance()); diff --git a/Mage.Sets/src/mage/cards/a/AzorsElocutors.java b/Mage.Sets/src/mage/cards/a/AzorsElocutors.java index 51fa3bb6a27..b0f3637b323 100644 --- a/Mage.Sets/src/mage/cards/a/AzorsElocutors.java +++ b/Mage.Sets/src/mage/cards/a/AzorsElocutors.java @@ -35,10 +35,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.RemoveCounterSourceEffect; 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.counters.Counter; import mage.game.Game; import mage.game.events.GameEvent; @@ -57,8 +54,8 @@ public class AzorsElocutors extends CardImpl { public AzorsElocutors(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W/U}{W/U}"); - this.subtype.add("Human"); - this.subtype.add("Advisor"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.ADVISOR); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AzureDrake.java b/Mage.Sets/src/mage/cards/a/AzureDrake.java index 2ad4057f7e4..8d74ffa7988 100644 --- a/Mage.Sets/src/mage/cards/a/AzureDrake.java +++ b/Mage.Sets/src/mage/cards/a/AzureDrake.java @@ -33,6 +33,7 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import java.util.UUID; @@ -45,7 +46,7 @@ public class AzureDrake extends CardImpl { public AzureDrake(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}"); - this.subtype.add("Drake"); + this.subtype.add(SubType.DRAKE); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AzureMage.java b/Mage.Sets/src/mage/cards/a/AzureMage.java index 8f54b72e44d..92ea9219e78 100644 --- a/Mage.Sets/src/mage/cards/a/AzureMage.java +++ b/Mage.Sets/src/mage/cards/a/AzureMage.java @@ -35,6 +35,7 @@ import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.SubType; import mage.constants.Zone; import java.util.UUID; @@ -46,8 +47,8 @@ public class AzureMage extends CardImpl { public AzureMage(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); - this.subtype.add("Human"); - this.subtype.add("Wizard"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AzusaLostButSeeking.java b/Mage.Sets/src/mage/cards/a/AzusaLostButSeeking.java index 2232946188b..d1bdd1a66c2 100644 --- a/Mage.Sets/src/mage/cards/a/AzusaLostButSeeking.java +++ b/Mage.Sets/src/mage/cards/a/AzusaLostButSeeking.java @@ -33,10 +33,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.continuous.PlayAdditionalLandsControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import java.util.UUID; @@ -49,8 +46,8 @@ public class AzusaLostButSeeking extends CardImpl { public AzusaLostButSeeking (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); addSuperType(SuperType.LEGENDARY); - this.subtype.add("Human"); - this.subtype.add("Monk"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.MONK); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/c/CallToServe.java b/Mage.Sets/src/mage/cards/c/CallToServe.java index fe1e3825aa5..0916230fef3 100644 --- a/Mage.Sets/src/mage/cards/c/CallToServe.java +++ b/Mage.Sets/src/mage/cards/c/CallToServe.java @@ -76,7 +76,7 @@ public class CallToServe extends CardImpl { Effect effect = new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA); effect.setText(", has flying"); ability.addEffect(effect); - effect = new AddCardSubtypeAttachedEffect("Angel", Duration.WhileOnBattlefield, AttachmentType.AURA); + effect = new AddCardSubtypeAttachedEffect(SubType.ANGEL, Duration.WhileOnBattlefield, AttachmentType.AURA); effect.setText(", and is an Angel in addition to its other types"); ability.addEffect(effect); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/Ghoulflesh.java b/Mage.Sets/src/mage/cards/g/Ghoulflesh.java index 814eec10e22..98c56b519da 100644 --- a/Mage.Sets/src/mage/cards/g/Ghoulflesh.java +++ b/Mage.Sets/src/mage/cards/g/Ghoulflesh.java @@ -60,7 +60,7 @@ public class Ghoulflesh extends CardImpl { // Enchanted creature gets -1/-1 and is a black Zombie in addition to its other colors and types. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-1, -1, Duration.WhileOnBattlefield))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddCardSubtypeAttachedEffect("Zombie", Duration.WhileOnBattlefield, AttachmentType.AURA))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddCardSubtypeAttachedEffect(SubType.ZOMBIE, Duration.WhileOnBattlefield, AttachmentType.AURA))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddCardColorAttachedEffect(ObjectColor.BLACK, Duration.WhileOnBattlefield, AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/t/TrooperArmor.java b/Mage.Sets/src/mage/cards/t/TrooperArmor.java index 9a36018faad..67d347e752e 100644 --- a/Mage.Sets/src/mage/cards/t/TrooperArmor.java +++ b/Mage.Sets/src/mage/cards/t/TrooperArmor.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; @@ -40,6 +39,8 @@ import mage.cards.CardSetInfo; import mage.constants.*; import mage.filter.FilterPermanent; +import java.util.UUID; + /** * * @author Styxo @@ -52,7 +53,7 @@ public class TrooperArmor extends CardImpl { // Equiped creature gets +1/+1 and is a Trooper in addition to its other types. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddCardSubtypeAttachedEffect("Trooper", Duration.WhileOnBattlefield, AttachmentType.EQUIPMENT))); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AddCardSubtypeAttachedEffect(SubType.TROOPER, Duration.WhileOnBattlefield, AttachmentType.EQUIPMENT))); // Whenever a Trooper enters the battlefield under your control, you may attach {this} to it. this.addAbility(new EntersBattlefieldControlledTriggeredAbility( diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAttachedEffect.java index b22025852cd..76aefcab8ae 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/AddCardSubtypeAttachedEffect.java @@ -38,10 +38,10 @@ import mage.game.permanent.Permanent; * @author nantuko */ public class AddCardSubtypeAttachedEffect extends ContinuousEffectImpl { - private String addedSubtype; + private SubType addedSubtype; private AttachmentType attachmentType; - public AddCardSubtypeAttachedEffect(String addedSubtype, Duration duration, AttachmentType attachmentType) { + public AddCardSubtypeAttachedEffect(SubType addedSubtype, Duration duration, AttachmentType attachmentType) { super(duration, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.Benefit); this.addedSubtype = addedSubtype; this.attachmentType = attachmentType; From 22c18ef2ff2fcfdd1ca3ca763889ea524c38bdbb Mon Sep 17 00:00:00 2001 From: Jeff Date: Tue, 18 Jul 2017 09:16:05 -0500 Subject: [PATCH 3/3] - Added requested card War's Toll. --- Mage.Sets/src/mage/cards/w/WarsToll.java | 122 +++++++++++++++++++++++ Mage.Sets/src/mage/sets/Dissension.java | 1 + 2 files changed, 123 insertions(+) create mode 100644 Mage.Sets/src/mage/cards/w/WarsToll.java diff --git a/Mage.Sets/src/mage/cards/w/WarsToll.java b/Mage.Sets/src/mage/cards/w/WarsToll.java new file mode 100644 index 00000000000..d34806a0a47 --- /dev/null +++ b/Mage.Sets/src/mage/cards/w/WarsToll.java @@ -0,0 +1,122 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.cards.w; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.common.AttacksAllTriggeredAbility; +import mage.abilities.common.TapForManaAllTriggeredAbility; +import mage.abilities.effects.Effect; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.TapAllEffect; +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.filter.common.FilterCreaturePermanent; +import mage.filter.common.FilterLandPermanent; +import mage.filter.predicate.permanent.ControllerIdPredicate; +import mage.filter.predicate.permanent.ControllerPredicate; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.players.Player; + +/** + * + * @author jeffwadsworth + */ +public class WarsToll extends CardImpl { + + private final static FilterCreaturePermanent filterOpponentCreature = new FilterCreaturePermanent("creature an opponent controls"); + private final static FilterLandPermanent filterOpponentLand = new FilterLandPermanent("an opponent taps a land"); + + + static { + filterOpponentCreature.add(new ControllerPredicate(TargetController.OPPONENT)); + filterOpponentLand.add(new ControllerPredicate(TargetController.OPPONENT)); + } + + public WarsToll(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}"); + + // Whenever an opponent taps a land for mana, tap all lands that player controls. + Effect effect = new TapAllEffect(filterOpponentLand); + effect.setText("tap all lands that player controls"); + this.addAbility(new TapForManaAllTriggeredAbility(effect, filterOpponentLand, SetTargetPointer.PLAYER)); + + // If a creature an opponent controls attacks, all creatures that opponent controls attack if able. + this.addAbility(new AttacksAllTriggeredAbility(new WarsTollEffect(), false, filterOpponentCreature, SetTargetPointer.PERMANENT, true)); + + } + + public WarsToll(final WarsToll card) { + super(card); + } + + @Override + public WarsToll copy() { + return new WarsToll(this); + } +} + +class WarsTollEffect extends OneShotEffect { + + private static final FilterCreaturePermanent filterOpponentCreatures = new FilterCreaturePermanent(); + + public WarsTollEffect() { + super(Outcome.Neutral); + staticText = "all creatures that opponent controls attack if able"; + } + + public WarsTollEffect(final WarsTollEffect effect) { + super(effect); + } + + @Override + public boolean apply(Game game, Ability source) { + Player opponent = game.getPlayer(game.getPermanent(getTargetPointer().getFirst(game, source)).getControllerId()); + if (opponent != null) { + filterOpponentCreatures.add(new ControllerIdPredicate(opponent.getId())); + for (Permanent permanent : game.getBattlefield().getAllActivePermanents(CardType.CREATURE)) { + if (filterOpponentCreatures.match(permanent, source.getSourceId(), source.getControllerId(), game)) { + //TODO: allow the player to choose between a planeswalker and player + opponent.declareAttacker(permanent.getId(), source.getControllerId(), game, false); + } + } + return true; + } + return false; + } + + @Override + public WarsTollEffect copy() { + return new WarsTollEffect(this); + } +} diff --git a/Mage.Sets/src/mage/sets/Dissension.java b/Mage.Sets/src/mage/sets/Dissension.java index f1d9450fbf1..eb5da37b7b6 100644 --- a/Mage.Sets/src/mage/sets/Dissension.java +++ b/Mage.Sets/src/mage/sets/Dissension.java @@ -203,6 +203,7 @@ public class Dissension extends ExpansionSet { cards.add(new SetCardInfo("Voidslime", 137, Rarity.RARE, mage.cards.v.Voidslime.class)); cards.add(new SetCardInfo("Wakestone Gargoyle", 21, Rarity.RARE, mage.cards.w.WakestoneGargoyle.class)); cards.add(new SetCardInfo("Walking Archive", 169, Rarity.RARE, mage.cards.w.WalkingArchive.class)); + cards.add(new SetCardInfo("War's Toll", 77, Rarity.RARE, mage.cards.w.WarsToll.class)); cards.add(new SetCardInfo("Whiptail Moloch", 79, Rarity.COMMON, mage.cards.w.WhiptailMoloch.class)); cards.add(new SetCardInfo("Windreaver", 138, Rarity.RARE, mage.cards.w.Windreaver.class)); cards.add(new SetCardInfo("Wit's End", 58, Rarity.RARE, mage.cards.w.WitsEnd.class));