From cbe610d33948e6d70def5ffadbddb06853fe04d8 Mon Sep 17 00:00:00 2001 From: "Alex W. Jackson" Date: Mon, 10 Oct 2022 16:40:53 -0400 Subject: [PATCH] Move PutCards enum to constants package --- Mage.Sets/src/mage/cards/a/ALittleChat.java | 2 +- .../src/mage/cards/a/AcclaimedContender.java | 2 +- .../src/mage/cards/a/AdventureAwaits.java | 6 ++- .../src/mage/cards/a/AdventurousImpulse.java | 2 +- .../src/mage/cards/a/AdviceFromTheFae.java | 2 +- .../src/mage/cards/a/AjaniMentorOfHeroes.java | 6 +-- .../src/mage/cards/a/AjanisInfluence.java | 2 +- .../src/mage/cards/a/AncestralMemories.java | 2 +- .../src/mage/cards/a/AncientStirrings.java | 2 +- Mage.Sets/src/mage/cards/a/Anticipate.java | 2 +- .../src/mage/cards/a/ArcaneInfusion.java | 2 +- .../src/mage/cards/a/ArcaneInvestigator.java | 2 +- Mage.Sets/src/mage/cards/a/ArcanistsOwl.java | 2 +- .../src/mage/cards/a/AstorBearerOfBlades.java | 19 +++---- Mage.Sets/src/mage/cards/a/AugurOfBolas.java | 2 +- .../src/mage/cards/a/AyeshaTanakaArmorer.java | 19 +++---- .../mage/cards/a/AzcantaTheSunkenRuin.java | 2 +- .../src/mage/cards/b/BasicConjuration.java | 2 +- .../src/mage/cards/b/BitterRevelation.java | 2 +- .../src/mage/cards/b/BlexVexingPest.java | 3 +- Mage.Sets/src/mage/cards/b/BloodPrice.java | 2 +- .../src/mage/cards/b/BlossomPrancer.java | 6 ++- .../mage/cards/b/BoardTheWeatherlight.java | 2 +- .../src/mage/cards/b/BondOfFlourishing.java | 2 +- Mage.Sets/src/mage/cards/b/BrazenUpstart.java | 2 +- .../src/mage/cards/b/BrightwoodTracker.java | 2 +- .../src/mage/cards/c/CalixDestinysHand.java | 1 - Mage.Sets/src/mage/cards/c/CarthTheLion.java | 1 - .../src/mage/cards/c/CartographersSurvey.java | 2 +- .../src/mage/cards/c/CavalierOfThorns.java | 2 +- .../src/mage/cards/c/CelestusSanctifier.java | 2 +- .../src/mage/cards/c/CollectedCompany.java | 2 +- .../mage/cards/c/CommuneWithDinosaurs.java | 2 +- .../src/mage/cards/c/CommuneWithNature.java | 2 +- .../src/mage/cards/c/CommuneWithSpirits.java | 2 +- .../src/mage/cards/c/CommuneWithTheGods.java | 2 +- .../src/mage/cards/c/ContingencyPlan.java | 2 +- .../src/mage/cards/c/CoralhelmChronicler.java | 2 +- .../src/mage/cards/c/CourageousOutrider.java | 2 +- Mage.Sets/src/mage/cards/c/CourtHussar.java | 2 +- .../src/mage/cards/c/CreativeOutburst.java | 2 +- Mage.Sets/src/mage/cards/c/Curate.java | 2 +- Mage.Sets/src/mage/cards/d/DarkBargain.java | 2 +- .../src/mage/cards/d/DeployTheGatewatch.java | 2 +- .../src/mage/cards/d/DiabolicVision.java | 2 +- .../src/mage/cards/d/DigThroughTime.java | 2 +- .../src/mage/cards/d/DihadaBinderOfWills.java | 1 - .../src/mage/cards/d/DiscerningTaste.java | 3 +- .../src/mage/cards/d/DomriChaosBringer.java | 1 - .../src/mage/cards/d/DovinGrandArbiter.java | 1 - .../src/mage/cards/d/DragonlordOjutai.java | 6 +-- .../src/mage/cards/d/DrawnFromDreams.java | 2 +- .../src/mage/cards/d/DuskwatchRecruiter.java | 2 +- Mage.Sets/src/mage/cards/e/EarlyFrost.java | 4 +- .../mage/cards/e/EllynHarbreezeBusybody.java | 9 ++-- .../src/mage/cards/e/ElvishRejuvenator.java | 2 +- .../src/mage/cards/f/FaerieMechanist.java | 9 ++-- .../src/mage/cards/f/FirjaJudgeOfValor.java | 2 +- .../src/mage/cards/f/FlashOfInsight.java | 2 +- .../src/mage/cards/f/FloriferousVinewall.java | 14 +++--- .../src/mage/cards/f/ForbiddenAlchemy.java | 2 +- Mage.Sets/src/mage/cards/f/FoulEmissary.java | 18 +++---- .../src/mage/cards/g/GarruksHarbinger.java | 2 +- Mage.Sets/src/mage/cards/g/GatherThePack.java | 2 +- .../src/mage/cards/g/GavonyDawnguard.java | 2 +- .../src/mage/cards/g/GenesisUltimatum.java | 2 +- .../src/mage/cards/g/GlacialRevelation.java | 2 +- .../src/mage/cards/g/GlimpseTheCosmos.java | 1 - .../src/mage/cards/g/GlimpseTheFuture.java | 2 +- .../src/mage/cards/g/GlintNestCrane.java | 2 +- Mage.Sets/src/mage/cards/g/GrimFlayer.java | 6 +-- Mage.Sets/src/mage/cards/g/GrislySalvage.java | 2 +- .../mage/cards/g/GrowingRitesOfItlimoc.java | 6 +-- Mage.Sets/src/mage/cards/g/GurmagDrowner.java | 2 +- .../src/mage/cards/h/HaraldKingOfSkemfar.java | 2 +- .../src/mage/cards/h/HatcherySpider.java | 1 - Mage.Sets/src/mage/cards/h/HeroesPodium.java | 2 +- .../src/mage/cards/i/IconOfAncestry.java | 1 - Mage.Sets/src/mage/cards/i/Impulse.java | 2 +- .../mage/cards/i/IncubationIncongruity.java | 2 +- .../src/mage/cards/i/IngeniousSmith.java | 2 +- .../mage/cards/j/JaceTheLivingGuildpact.java | 2 +- Mage.Sets/src/mage/cards/j/JarOfEyeballs.java | 2 +- .../mage/cards/k/KeskitTheFleshSculptor.java | 2 +- .../src/mage/cards/k/KinnanBonderProdigy.java | 1 - .../src/mage/cards/k/KolvoriGodOfKinship.java | 1 - .../src/mage/cards/k/KrosanRestorer.java | 4 +- .../src/mage/cards/k/KruphixsInsight.java | 2 +- Mage.Sets/src/mage/cards/l/LavaballTrap.java | 7 +-- .../src/mage/cards/l/LeadTheStampede.java | 2 +- .../src/mage/cards/l/LilianasSpoils.java | 2 +- Mage.Sets/src/mage/cards/l/LoneRevenant.java | 2 +- Mage.Sets/src/mage/cards/m/Machinate.java | 2 +- Mage.Sets/src/mage/cards/m/MaestrosCharm.java | 2 +- .../src/mage/cards/m/MayaelTheAnima.java | 7 +-- .../src/mage/cards/m/MeletisAstronomer.java | 2 +- .../src/mage/cards/m/MemorialToUnity.java | 2 +- Mage.Sets/src/mage/cards/m/MemoryDeluge.java | 2 +- Mage.Sets/src/mage/cards/m/MilitiaBugler.java | 2 +- .../src/mage/cards/m/MundaAmbushLeader.java | 2 +- .../src/mage/cards/n/NaelAvizoaAeronaut.java | 12 ++--- Mage.Sets/src/mage/cards/n/NagaOracle.java | 2 +- .../src/mage/cards/n/NaggingThoughts.java | 2 +- .../mage/cards/n/NahiriHeirOfTheAncients.java | 1 - .../src/mage/cards/n/NarsetParterOfVeils.java | 1 - .../src/mage/cards/n/Necrosynthesis.java | 1 - .../src/mage/cards/n/NessianGameWarden.java | 2 +- .../src/mage/cards/n/NessianWanderer.java | 2 +- .../src/mage/cards/n/NissaGenesisMage.java | 11 ++--- .../src/mage/cards/n/NissaSageAnimist.java | 3 +- .../src/mage/cards/n/NumotTheDevastator.java | 4 +- .../mage/cards/n/NymrisOonasTrickster.java | 2 +- Mage.Sets/src/mage/cards/o/OathOfNissa.java | 1 - Mage.Sets/src/mage/cards/o/OnceUponATime.java | 2 +- .../src/mage/cards/o/OrbOfDragonkind.java | 2 +- Mage.Sets/src/mage/cards/o/OrganHoarder.java | 2 +- .../src/mage/cards/o/OtherworldlyGaze.java | 2 +- .../src/mage/cards/p/PeerThroughDepths.java | 2 +- Mage.Sets/src/mage/cards/p/Petradon.java | 2 +- .../src/mage/cards/p/PiecesOfThePuzzle.java | 2 +- Mage.Sets/src/mage/cards/p/PlowUnder.java | 4 +- .../src/mage/cards/p/PreferredSelection.java | 2 +- Mage.Sets/src/mage/cards/p/ProfessorOnyx.java | 1 - Mage.Sets/src/mage/cards/p/PropheticBolt.java | 2 +- .../src/mage/cards/p/PropheticTitan.java | 2 +- .../src/mage/cards/q/QuandrixApprentice.java | 2 +- .../src/mage/cards/r/RalIzzetViceroy.java | 2 +- Mage.Sets/src/mage/cards/r/RalsOutburst.java | 2 +- Mage.Sets/src/mage/cards/r/RansackTheLab.java | 2 +- Mage.Sets/src/mage/cards/r/RavenFamiliar.java | 2 +- Mage.Sets/src/mage/cards/r/RealityHeist.java | 2 +- .../src/mage/cards/r/RecruitmentOfficer.java | 9 ++-- .../src/mage/cards/s/SarkhansDragonfire.java | 2 +- Mage.Sets/src/mage/cards/s/SatoruUmezawa.java | 1 - .../src/mage/cards/s/SatyrWayfinder.java | 2 +- .../src/mage/cards/s/ScatteredThoughts.java | 2 +- .../src/mage/cards/s/ScionOfHalaster.java | 5 +- .../src/mage/cards/s/ScoutTheBorders.java | 2 +- Mage.Sets/src/mage/cards/s/SeaGateOracle.java | 2 +- .../src/mage/cards/s/SeeTheUnwritten.java | 2 +- Mage.Sets/src/mage/cards/s/SeekTheWilds.java | 2 +- .../src/mage/cards/s/ShadowProphecy.java | 6 +-- .../mage/cards/s/ShigekiJukaiVisionary.java | 1 - .../mage/cards/s/ShimmerOfPossibility.java | 2 +- .../mage/cards/s/SigardaChampionOfLight.java | 1 - .../src/mage/cards/s/SightBeyondSight.java | 2 +- .../src/mage/cards/s/SilhanaWayfinder.java | 2 +- Mage.Sets/src/mage/cards/s/SilundiVision.java | 2 +- .../src/mage/cards/s/SilverbackElder.java | 10 ++-- .../mage/cards/s/SionaCaptainOfThePyleas.java | 6 +-- Mage.Sets/src/mage/cards/s/SkallaWolf.java | 4 +- Mage.Sets/src/mage/cards/s/SleightOfHand.java | 2 +- .../src/mage/cards/s/SlimefootsSurvey.java | 4 +- .../src/mage/cards/s/SoulcipherBoard.java | 2 +- .../src/mage/cards/s/StoneforgeAcolyte.java | 2 +- .../src/mage/cards/s/StormTheFestival.java | 2 +- .../src/mage/cards/s/StrategicPlanning.java | 2 +- .../src/mage/cards/s/SultaiAscendancy.java | 2 +- .../src/mage/cards/s/SultaiSoothsayer.java | 2 +- .../src/mage/cards/s/SumalaWoodshaper.java | 2 +- Mage.Sets/src/mage/cards/s/SummoningTrap.java | 1 - Mage.Sets/src/mage/cards/s/SupremeWill.java | 2 +- .../src/mage/cards/t/TaigamSidisisHand.java | 1 - .../src/mage/cards/t/TaigamsScheming.java | 2 +- Mage.Sets/src/mage/cards/t/TalasLookout.java | 9 ++-- .../src/mage/cards/t/TappingAtTheWindow.java | 2 +- .../src/mage/cards/t/TazriBeaconOfUnity.java | 2 +- .../mage/cards/t/TeferiTemporalArchmage.java | 2 +- .../mage/cards/t/TeferiWhoSlowsTheSunset.java | 6 +-- .../mage/cards/t/TezzeretAgentOfBolas.java | 7 +-- .../mage/cards/t/TezzeretsGatebreaker.java | 2 +- .../src/mage/cards/t/ThassasIntervention.java | 2 +- .../src/mage/cards/t/TheAntiquitiesWar.java | 9 +--- .../src/mage/cards/t/TheLadyOfOtaria.java | 5 +- Mage.Sets/src/mage/cards/t/TheManaRig.java | 2 +- Mage.Sets/src/mage/cards/t/TheWorldSpell.java | 5 +- .../src/mage/cards/t/ThievesFortune.java | 2 +- .../mage/cards/t/TomorrowAzamisFamiliar.java | 1 - .../mage/cards/t/TorstenFounderOfBenalia.java | 9 ++-- Mage.Sets/src/mage/cards/t/TowerGeist.java | 2 +- .../src/mage/cards/t/TrackersInstincts.java | 2 +- Mage.Sets/src/mage/cards/t/TrailOfCrumbs.java | 2 +- .../src/mage/cards/u/UncoveredClues.java | 2 +- .../src/mage/cards/u/UnderrealmLich.java | 2 +- .../src/mage/cards/u/UnityOfTheDroids.java | 2 +- .../mage/cards/u/UrzaAcademyHeadmaster.java | 1 - .../src/mage/cards/v/VesselOfNascency.java | 2 +- .../src/mage/cards/v/VineshaperProdigy.java | 9 ++-- Mage.Sets/src/mage/cards/v/VivienReid.java | 2 +- .../src/mage/cards/v/VodaSeaScavenger.java | 8 ++- Mage.Sets/src/mage/cards/w/WakerOfWaves.java | 1 - Mage.Sets/src/mage/cards/w/WanderingMind.java | 2 +- Mage.Sets/src/mage/cards/w/WarlockClass.java | 1 - Mage.Sets/src/mage/cards/w/WarmWelcome.java | 2 +- Mage.Sets/src/mage/cards/w/Weatherlight.java | 2 +- .../src/mage/cards/w/WildsongHowler.java | 2 +- .../src/mage/cards/w/WitnessTheFuture.java | 2 +- .../src/mage/cards/y/YodaJediMaster.java | 8 +-- .../src/mage/cards/y/YouMeetInATavern.java | 2 +- .../LookLibraryAndPickControllerEffect.java | 9 ++-- .../common/LookLibraryControllerEffect.java | 41 +--------------- .../RevealLibraryPickControllerEffect.java | 1 + .../main/java/mage/constants/PutCards.java | 49 +++++++++++++++++++ .../target/common/TargetLandPermanent.java | 6 +-- 204 files changed, 289 insertions(+), 416 deletions(-) create mode 100644 Mage/src/main/java/mage/constants/PutCards.java diff --git a/Mage.Sets/src/mage/cards/a/ALittleChat.java b/Mage.Sets/src/mage/cards/a/ALittleChat.java index fd65e1b9533..f7a30ce598b 100644 --- a/Mage.Sets/src/mage/cards/a/ALittleChat.java +++ b/Mage.Sets/src/mage/cards/a/ALittleChat.java @@ -1,11 +1,11 @@ package mage.cards.a; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.CasualtyAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/AcclaimedContender.java b/Mage.Sets/src/mage/cards/a/AcclaimedContender.java index 51003c288d8..5ce894f2047 100644 --- a/Mage.Sets/src/mage/cards/a/AcclaimedContender.java +++ b/Mage.Sets/src/mage/cards/a/AcclaimedContender.java @@ -6,10 +6,10 @@ import mage.abilities.condition.Condition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/cards/a/AdventureAwaits.java b/Mage.Sets/src/mage/cards/a/AdventureAwaits.java index 52d331b8222..5c5d027b531 100644 --- a/Mage.Sets/src/mage/cards/a/AdventureAwaits.java +++ b/Mage.Sets/src/mage/cards/a/AdventureAwaits.java @@ -3,9 +3,11 @@ package mage.cards.a; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; -import mage.cards.*; +import mage.cards.Cards; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; import mage.game.Game; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/a/AdventurousImpulse.java b/Mage.Sets/src/mage/cards/a/AdventurousImpulse.java index 4b447bd211e..fc309d54433 100644 --- a/Mage.Sets/src/mage/cards/a/AdventurousImpulse.java +++ b/Mage.Sets/src/mage/cards/a/AdventurousImpulse.java @@ -2,10 +2,10 @@ package mage.cards.a; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; /** diff --git a/Mage.Sets/src/mage/cards/a/AdviceFromTheFae.java b/Mage.Sets/src/mage/cards/a/AdviceFromTheFae.java index a4cd6e707c4..e27dc30fedb 100644 --- a/Mage.Sets/src/mage/cards/a/AdviceFromTheFae.java +++ b/Mage.Sets/src/mage/cards/a/AdviceFromTheFae.java @@ -5,10 +5,10 @@ import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/a/AjaniMentorOfHeroes.java b/Mage.Sets/src/mage/cards/a/AjaniMentorOfHeroes.java index f3c9a18acd4..6e02710c122 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniMentorOfHeroes.java +++ b/Mage.Sets/src/mage/cards/a/AjaniMentorOfHeroes.java @@ -6,14 +6,10 @@ import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; 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.SuperType; -import mage.constants.TargetController; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/a/AjanisInfluence.java b/Mage.Sets/src/mage/cards/a/AjanisInfluence.java index fd10941fba3..6702a766765 100644 --- a/Mage.Sets/src/mage/cards/a/AjanisInfluence.java +++ b/Mage.Sets/src/mage/cards/a/AjanisInfluence.java @@ -3,11 +3,11 @@ package mage.cards.a; import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.counters.CounterType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; diff --git a/Mage.Sets/src/mage/cards/a/AncestralMemories.java b/Mage.Sets/src/mage/cards/a/AncestralMemories.java index 74f1b83ba39..1a0c675ad44 100644 --- a/Mage.Sets/src/mage/cards/a/AncestralMemories.java +++ b/Mage.Sets/src/mage/cards/a/AncestralMemories.java @@ -1,10 +1,10 @@ package mage.cards.a; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/AncientStirrings.java b/Mage.Sets/src/mage/cards/a/AncientStirrings.java index 137ad672c1b..f9db9656d00 100644 --- a/Mage.Sets/src/mage/cards/a/AncientStirrings.java +++ b/Mage.Sets/src/mage/cards/a/AncientStirrings.java @@ -2,10 +2,10 @@ package mage.cards.a; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorlessPredicate; diff --git a/Mage.Sets/src/mage/cards/a/Anticipate.java b/Mage.Sets/src/mage/cards/a/Anticipate.java index 3e3bc99c5d3..45e332212d8 100644 --- a/Mage.Sets/src/mage/cards/a/Anticipate.java +++ b/Mage.Sets/src/mage/cards/a/Anticipate.java @@ -1,10 +1,10 @@ package mage.cards.a; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/ArcaneInfusion.java b/Mage.Sets/src/mage/cards/a/ArcaneInfusion.java index e8ab05a63a6..90862c920e9 100644 --- a/Mage.Sets/src/mage/cards/a/ArcaneInfusion.java +++ b/Mage.Sets/src/mage/cards/a/ArcaneInfusion.java @@ -2,11 +2,11 @@ package mage.cards.a; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/ArcaneInvestigator.java b/Mage.Sets/src/mage/cards/a/ArcaneInvestigator.java index 4c499ef1578..dceb053330b 100644 --- a/Mage.Sets/src/mage/cards/a/ArcaneInvestigator.java +++ b/Mage.Sets/src/mage/cards/a/ArcaneInvestigator.java @@ -5,11 +5,11 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RollDieWithResultTableEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/ArcanistsOwl.java b/Mage.Sets/src/mage/cards/a/ArcanistsOwl.java index 66b1f2b7c19..dfb756bc970 100644 --- a/Mage.Sets/src/mage/cards/a/ArcanistsOwl.java +++ b/Mage.Sets/src/mage/cards/a/ArcanistsOwl.java @@ -3,11 +3,11 @@ package mage.cards.a; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterArtifactOrEnchantmentCard; diff --git a/Mage.Sets/src/mage/cards/a/AstorBearerOfBlades.java b/Mage.Sets/src/mage/cards/a/AstorBearerOfBlades.java index e8a542a4cbe..4de9d342537 100644 --- a/Mage.Sets/src/mage/cards/a/AstorBearerOfBlades.java +++ b/Mage.Sets/src/mage/cards/a/AstorBearerOfBlades.java @@ -4,16 +4,12 @@ import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.CrewAbility; import mage.abilities.keyword.EquipAbility; 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.constants.*; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; @@ -40,18 +36,15 @@ public final class AstorBearerOfBlades extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}{W}"); this.addSuperType(SuperType.LEGENDARY); - this.subtype.add(SubType.HUMAN); - this.subtype.add(SubType.WARRIOR); + this.subtype.add(SubType.HUMAN, SubType.WARRIOR); this.power = new MageInt(4); this.toughness = new MageInt(4); - // When Astor, Bearer of Blades enters the battlefield, look at the top seven cards of your library. You may reveal an Equipment or Vehicle card from among them and put it into your hand. Put the rest on the bottom of your library in a random order. + // When Astor, Bearer of Blades enters the battlefield, look at the top seven cards of your library. + // You may reveal an Equipment or Vehicle card from among them and put it into your hand. + // Put the rest on the bottom of your library in a random order. this.addAbility(new EntersBattlefieldTriggeredAbility( - new LookLibraryAndPickControllerEffect( - 7, 1, filter, - LookLibraryControllerEffect.PutCards.HAND, - LookLibraryControllerEffect.PutCards.BOTTOM_RANDOM - ) + new LookLibraryAndPickControllerEffect(7, 1, filter, PutCards.HAND, PutCards.BOTTOM_RANDOM) )); // Equipment you control have equip {1}. diff --git a/Mage.Sets/src/mage/cards/a/AugurOfBolas.java b/Mage.Sets/src/mage/cards/a/AugurOfBolas.java index 61f0f9e82b7..784d63150d9 100644 --- a/Mage.Sets/src/mage/cards/a/AugurOfBolas.java +++ b/Mage.Sets/src/mage/cards/a/AugurOfBolas.java @@ -3,10 +3,10 @@ package mage.cards.a; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/a/AyeshaTanakaArmorer.java b/Mage.Sets/src/mage/cards/a/AyeshaTanakaArmorer.java index a5a841256be..5968c80f39d 100644 --- a/Mage.Sets/src/mage/cards/a/AyeshaTanakaArmorer.java +++ b/Mage.Sets/src/mage/cards/a/AyeshaTanakaArmorer.java @@ -8,15 +8,11 @@ import mage.abilities.condition.Condition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalRestrictionEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.effects.common.combat.CantBeBlockedSourceEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ComparisonType; -import mage.constants.SubType; -import mage.constants.SuperType; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactCard; @@ -53,16 +49,15 @@ public final class AyeshaTanakaArmorer extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}{U}"); this.addSuperType(SuperType.LEGENDARY); - this.subtype.add(SubType.HUMAN); - this.subtype.add(SubType.ARTIFICER); + this.subtype.add(SubType.HUMAN, SubType.ARTIFICER); this.power = new MageInt(2); this.toughness = new MageInt(4); - // Whenever Ayesha Tanaka, Armorer attacks, look at the top four cards of your library. You may put any number of artifact cards with mana value less than or equal to Ayesha's power from among them onto the battlefield tapped. Put the rest on the bottom of your library in a random order. + // Whenever Ayesha Tanaka, Armorer attacks, look at the top four cards of your library. + // You may put any number of artifact cards with mana value less than or equal to Ayesha's power + // from among them onto the battlefield tapped. Put the rest on the bottom of your library in a random order. this.addAbility(new AttacksTriggeredAbility(new LookLibraryAndPickControllerEffect( - 4, Integer.MAX_VALUE, filter, - LookLibraryControllerEffect.PutCards.BATTLEFIELD_TAPPED, - LookLibraryControllerEffect.PutCards.BOTTOM_RANDOM + 4, Integer.MAX_VALUE, filter, PutCards.BATTLEFIELD_TAPPED, PutCards.BOTTOM_RANDOM ))); // Ayesha can't be blocked as long as defending player controls three or more artifacts. @@ -95,4 +90,4 @@ enum AyeshaTanakaArmorerPredicate implements ObjectSourcePlayerPredicate { .map(p -> input.getObject().getManaValue() <= p) .orElse(false); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/a/AzcantaTheSunkenRuin.java b/Mage.Sets/src/mage/cards/a/AzcantaTheSunkenRuin.java index fce92d1a56d..7492616f326 100644 --- a/Mage.Sets/src/mage/cards/a/AzcantaTheSunkenRuin.java +++ b/Mage.Sets/src/mage/cards/a/AzcantaTheSunkenRuin.java @@ -6,11 +6,11 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; diff --git a/Mage.Sets/src/mage/cards/b/BasicConjuration.java b/Mage.Sets/src/mage/cards/b/BasicConjuration.java index 4c8e38d7fa1..04976e9d66a 100644 --- a/Mage.Sets/src/mage/cards/b/BasicConjuration.java +++ b/Mage.Sets/src/mage/cards/b/BasicConjuration.java @@ -2,10 +2,10 @@ package mage.cards.b; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/b/BitterRevelation.java b/Mage.Sets/src/mage/cards/b/BitterRevelation.java index 0e37f7fbaa2..2083d5df964 100644 --- a/Mage.Sets/src/mage/cards/b/BitterRevelation.java +++ b/Mage.Sets/src/mage/cards/b/BitterRevelation.java @@ -2,11 +2,11 @@ package mage.cards.b; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; /** * diff --git a/Mage.Sets/src/mage/cards/b/BlexVexingPest.java b/Mage.Sets/src/mage/cards/b/BlexVexingPest.java index c67811db949..e2edd272bd3 100644 --- a/Mage.Sets/src/mage/cards/b/BlexVexingPest.java +++ b/Mage.Sets/src/mage/cards/b/BlexVexingPest.java @@ -8,12 +8,11 @@ import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.Cards; +import mage.cards.CardSetInfo; import mage.cards.ModalDoubleFacesCard; import mage.constants.*; -import mage.cards.CardSetInfo; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/b/BloodPrice.java b/Mage.Sets/src/mage/cards/b/BloodPrice.java index 93305849f4c..94e983ef66e 100644 --- a/Mage.Sets/src/mage/cards/b/BloodPrice.java +++ b/Mage.Sets/src/mage/cards/b/BloodPrice.java @@ -1,11 +1,11 @@ package mage.cards.b; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/b/BlossomPrancer.java b/Mage.Sets/src/mage/cards/b/BlossomPrancer.java index 4cd309b21df..37bc85c8de6 100644 --- a/Mage.Sets/src/mage/cards/b/BlossomPrancer.java +++ b/Mage.Sets/src/mage/cards/b/BlossomPrancer.java @@ -5,10 +5,12 @@ import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.ReachAbility; -import mage.cards.*; +import mage.cards.Cards; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; diff --git a/Mage.Sets/src/mage/cards/b/BoardTheWeatherlight.java b/Mage.Sets/src/mage/cards/b/BoardTheWeatherlight.java index f8539a32c22..3651f377746 100644 --- a/Mage.Sets/src/mage/cards/b/BoardTheWeatherlight.java +++ b/Mage.Sets/src/mage/cards/b/BoardTheWeatherlight.java @@ -2,10 +2,10 @@ package mage.cards.b; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.HistoricPredicate; diff --git a/Mage.Sets/src/mage/cards/b/BondOfFlourishing.java b/Mage.Sets/src/mage/cards/b/BondOfFlourishing.java index de08f840a85..73e40dc4250 100644 --- a/Mage.Sets/src/mage/cards/b/BondOfFlourishing.java +++ b/Mage.Sets/src/mage/cards/b/BondOfFlourishing.java @@ -2,10 +2,10 @@ package mage.cards.b; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.common.FilterPermanentCard; diff --git a/Mage.Sets/src/mage/cards/b/BrazenUpstart.java b/Mage.Sets/src/mage/cards/b/BrazenUpstart.java index 2d6b63d5b15..3f9274c5a65 100644 --- a/Mage.Sets/src/mage/cards/b/BrazenUpstart.java +++ b/Mage.Sets/src/mage/cards/b/BrazenUpstart.java @@ -3,11 +3,11 @@ package mage.cards.b; import mage.MageInt; import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/b/BrightwoodTracker.java b/Mage.Sets/src/mage/cards/b/BrightwoodTracker.java index 1b27828d57d..d0a7290e6b0 100644 --- a/Mage.Sets/src/mage/cards/b/BrightwoodTracker.java +++ b/Mage.Sets/src/mage/cards/b/BrightwoodTracker.java @@ -6,10 +6,10 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/c/CalixDestinysHand.java b/Mage.Sets/src/mage/cards/c/CalixDestinysHand.java index 15c7c64dc28..8c32b426880 100644 --- a/Mage.Sets/src/mage/cards/c/CalixDestinysHand.java +++ b/Mage.Sets/src/mage/cards/c/CalixDestinysHand.java @@ -7,7 +7,6 @@ import mage.abilities.LoyaltyAbility; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.ReturnToBattlefieldUnderOwnerControlTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; diff --git a/Mage.Sets/src/mage/cards/c/CarthTheLion.java b/Mage.Sets/src/mage/cards/c/CarthTheLion.java index b9d9b458bab..c9294f550cb 100644 --- a/Mage.Sets/src/mage/cards/c/CarthTheLion.java +++ b/Mage.Sets/src/mage/cards/c/CarthTheLion.java @@ -7,7 +7,6 @@ import mage.abilities.LoyaltyAbility; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.constants.*; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/cards/c/CartographersSurvey.java b/Mage.Sets/src/mage/cards/c/CartographersSurvey.java index 47b0cfb460d..536db468a8b 100644 --- a/Mage.Sets/src/mage/cards/c/CartographersSurvey.java +++ b/Mage.Sets/src/mage/cards/c/CartographersSurvey.java @@ -3,10 +3,10 @@ package mage.cards.c; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; /** diff --git a/Mage.Sets/src/mage/cards/c/CavalierOfThorns.java b/Mage.Sets/src/mage/cards/c/CavalierOfThorns.java index 7277d9269f7..1237ca76d64 100644 --- a/Mage.Sets/src/mage/cards/c/CavalierOfThorns.java +++ b/Mage.Sets/src/mage/cards/c/CavalierOfThorns.java @@ -6,13 +6,13 @@ import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.common.ExileSourceFromGraveCost; import mage.abilities.effects.common.DoIfCostPaid; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/c/CelestusSanctifier.java b/Mage.Sets/src/mage/cards/c/CelestusSanctifier.java index 141461a4b0b..39590ae1957 100644 --- a/Mage.Sets/src/mage/cards/c/CelestusSanctifier.java +++ b/Mage.Sets/src/mage/cards/c/CelestusSanctifier.java @@ -4,10 +4,10 @@ import mage.MageInt; import mage.abilities.common.BecomeDayAsEntersAbility; import mage.abilities.common.BecomesDayOrNightTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/c/CollectedCompany.java b/Mage.Sets/src/mage/cards/c/CollectedCompany.java index a41f1b164e0..60ec265ce24 100644 --- a/Mage.Sets/src/mage/cards/c/CollectedCompany.java +++ b/Mage.Sets/src/mage/cards/c/CollectedCompany.java @@ -2,11 +2,11 @@ package mage.cards.c; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.ManaValuePredicate; diff --git a/Mage.Sets/src/mage/cards/c/CommuneWithDinosaurs.java b/Mage.Sets/src/mage/cards/c/CommuneWithDinosaurs.java index e9ec1c7786a..6ffe037ff34 100644 --- a/Mage.Sets/src/mage/cards/c/CommuneWithDinosaurs.java +++ b/Mage.Sets/src/mage/cards/c/CommuneWithDinosaurs.java @@ -2,10 +2,10 @@ package mage.cards.c; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; diff --git a/Mage.Sets/src/mage/cards/c/CommuneWithNature.java b/Mage.Sets/src/mage/cards/c/CommuneWithNature.java index 9b216d38738..c7085ab45b7 100644 --- a/Mage.Sets/src/mage/cards/c/CommuneWithNature.java +++ b/Mage.Sets/src/mage/cards/c/CommuneWithNature.java @@ -2,10 +2,10 @@ package mage.cards.c; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; /** diff --git a/Mage.Sets/src/mage/cards/c/CommuneWithSpirits.java b/Mage.Sets/src/mage/cards/c/CommuneWithSpirits.java index f51fc750c52..4e1ee57f27c 100644 --- a/Mage.Sets/src/mage/cards/c/CommuneWithSpirits.java +++ b/Mage.Sets/src/mage/cards/c/CommuneWithSpirits.java @@ -1,10 +1,10 @@ package mage.cards.c; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; diff --git a/Mage.Sets/src/mage/cards/c/CommuneWithTheGods.java b/Mage.Sets/src/mage/cards/c/CommuneWithTheGods.java index eb688a01ec6..bf3e517e4cc 100644 --- a/Mage.Sets/src/mage/cards/c/CommuneWithTheGods.java +++ b/Mage.Sets/src/mage/cards/c/CommuneWithTheGods.java @@ -1,11 +1,11 @@ package mage.cards.c; import java.util.UUID; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; diff --git a/Mage.Sets/src/mage/cards/c/ContingencyPlan.java b/Mage.Sets/src/mage/cards/c/ContingencyPlan.java index e3aefc29b9e..4fede4c93e7 100644 --- a/Mage.Sets/src/mage/cards/c/ContingencyPlan.java +++ b/Mage.Sets/src/mage/cards/c/ContingencyPlan.java @@ -2,10 +2,10 @@ package mage.cards.c; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; /** * diff --git a/Mage.Sets/src/mage/cards/c/CoralhelmChronicler.java b/Mage.Sets/src/mage/cards/c/CoralhelmChronicler.java index 13a9d9baaf0..d15e5d32c22 100644 --- a/Mage.Sets/src/mage/cards/c/CoralhelmChronicler.java +++ b/Mage.Sets/src/mage/cards/c/CoralhelmChronicler.java @@ -5,11 +5,11 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DrawDiscardControllerEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.KickerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/c/CourageousOutrider.java b/Mage.Sets/src/mage/cards/c/CourageousOutrider.java index 5ef2464947f..95987b1aa71 100644 --- a/Mage.Sets/src/mage/cards/c/CourageousOutrider.java +++ b/Mage.Sets/src/mage/cards/c/CourageousOutrider.java @@ -4,10 +4,10 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/cards/c/CourtHussar.java b/Mage.Sets/src/mage/cards/c/CourtHussar.java index af4d720f610..0e39a447f3d 100644 --- a/Mage.Sets/src/mage/cards/c/CourtHussar.java +++ b/Mage.Sets/src/mage/cards/c/CourtHussar.java @@ -5,12 +5,12 @@ import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.ManaWasSpentCondition; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.SacrificeSourceUnlessConditionEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.ColoredManaSymbol; diff --git a/Mage.Sets/src/mage/cards/c/CreativeOutburst.java b/Mage.Sets/src/mage/cards/c/CreativeOutburst.java index eeb5fe7a5c5..1981e17b95d 100644 --- a/Mage.Sets/src/mage/cards/c/CreativeOutburst.java +++ b/Mage.Sets/src/mage/cards/c/CreativeOutburst.java @@ -7,10 +7,10 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.Zone; import mage.game.permanent.token.TreasureToken; import mage.target.common.TargetAnyTarget; diff --git a/Mage.Sets/src/mage/cards/c/Curate.java b/Mage.Sets/src/mage/cards/c/Curate.java index cb246a89ec7..18279d40fae 100644 --- a/Mage.Sets/src/mage/cards/c/Curate.java +++ b/Mage.Sets/src/mage/cards/c/Curate.java @@ -2,10 +2,10 @@ package mage.cards.c; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/d/DarkBargain.java b/Mage.Sets/src/mage/cards/d/DarkBargain.java index 64746094866..deb6ab6a873 100644 --- a/Mage.Sets/src/mage/cards/d/DarkBargain.java +++ b/Mage.Sets/src/mage/cards/d/DarkBargain.java @@ -3,10 +3,10 @@ package mage.cards.d; import java.util.UUID; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; /** * diff --git a/Mage.Sets/src/mage/cards/d/DeployTheGatewatch.java b/Mage.Sets/src/mage/cards/d/DeployTheGatewatch.java index 9bd9d851b9b..7cf6af18c03 100644 --- a/Mage.Sets/src/mage/cards/d/DeployTheGatewatch.java +++ b/Mage.Sets/src/mage/cards/d/DeployTheGatewatch.java @@ -3,10 +3,10 @@ package mage.cards.d; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.common.FilterPlaneswalkerCard; diff --git a/Mage.Sets/src/mage/cards/d/DiabolicVision.java b/Mage.Sets/src/mage/cards/d/DiabolicVision.java index 8a422cfc068..882697491d6 100644 --- a/Mage.Sets/src/mage/cards/d/DiabolicVision.java +++ b/Mage.Sets/src/mage/cards/d/DiabolicVision.java @@ -2,10 +2,10 @@ package mage.cards.d; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; /** * diff --git a/Mage.Sets/src/mage/cards/d/DigThroughTime.java b/Mage.Sets/src/mage/cards/d/DigThroughTime.java index b9a8c554ca1..0e2b3f88492 100644 --- a/Mage.Sets/src/mage/cards/d/DigThroughTime.java +++ b/Mage.Sets/src/mage/cards/d/DigThroughTime.java @@ -1,11 +1,11 @@ package mage.cards.d; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.DelveAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/d/DihadaBinderOfWills.java b/Mage.Sets/src/mage/cards/d/DihadaBinderOfWills.java index a6fd73628f1..5dfbd83bc4e 100644 --- a/Mage.Sets/src/mage/cards/d/DihadaBinderOfWills.java +++ b/Mage.Sets/src/mage/cards/d/DihadaBinderOfWills.java @@ -4,7 +4,6 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.CanBeYourCommanderAbility; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.abilities.effects.common.UntapAllEffect; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; diff --git a/Mage.Sets/src/mage/cards/d/DiscerningTaste.java b/Mage.Sets/src/mage/cards/d/DiscerningTaste.java index 79afbce533f..6d004a64b89 100644 --- a/Mage.Sets/src/mage/cards/d/DiscerningTaste.java +++ b/Mage.Sets/src/mage/cards/d/DiscerningTaste.java @@ -5,12 +5,11 @@ import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; -import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.Cards; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/d/DomriChaosBringer.java b/Mage.Sets/src/mage/cards/d/DomriChaosBringer.java index 7d4814aa1ec..45d8472d939 100644 --- a/Mage.Sets/src/mage/cards/d/DomriChaosBringer.java +++ b/Mage.Sets/src/mage/cards/d/DomriChaosBringer.java @@ -8,7 +8,6 @@ import mage.abilities.LoyaltyAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.GetEmblemEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.mana.ManaEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledSpellsEffect; import mage.abilities.effects.mana.BasicManaEffect; diff --git a/Mage.Sets/src/mage/cards/d/DovinGrandArbiter.java b/Mage.Sets/src/mage/cards/d/DovinGrandArbiter.java index 55c899a46b5..24c6d3d1665 100644 --- a/Mage.Sets/src/mage/cards/d/DovinGrandArbiter.java +++ b/Mage.Sets/src/mage/cards/d/DovinGrandArbiter.java @@ -7,7 +7,6 @@ import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; diff --git a/Mage.Sets/src/mage/cards/d/DragonlordOjutai.java b/Mage.Sets/src/mage/cards/d/DragonlordOjutai.java index d2faf5617bb..aa574e76dbe 100644 --- a/Mage.Sets/src/mage/cards/d/DragonlordOjutai.java +++ b/Mage.Sets/src/mage/cards/d/DragonlordOjutai.java @@ -7,16 +7,12 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.SourceTappedCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SubType; -import mage.constants.SuperType; +import mage.constants.*; /** * diff --git a/Mage.Sets/src/mage/cards/d/DrawnFromDreams.java b/Mage.Sets/src/mage/cards/d/DrawnFromDreams.java index c55cc5520d2..1d1c0249575 100644 --- a/Mage.Sets/src/mage/cards/d/DrawnFromDreams.java +++ b/Mage.Sets/src/mage/cards/d/DrawnFromDreams.java @@ -1,10 +1,10 @@ package mage.cards.d; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/d/DuskwatchRecruiter.java b/Mage.Sets/src/mage/cards/d/DuskwatchRecruiter.java index 4fe12c18a97..695fb926a45 100644 --- a/Mage.Sets/src/mage/cards/d/DuskwatchRecruiter.java +++ b/Mage.Sets/src/mage/cards/d/DuskwatchRecruiter.java @@ -7,11 +7,11 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.WerewolfFrontTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/e/EarlyFrost.java b/Mage.Sets/src/mage/cards/e/EarlyFrost.java index ce71258c2d9..b4bab28ecd1 100644 --- a/Mage.Sets/src/mage/cards/e/EarlyFrost.java +++ b/Mage.Sets/src/mage/cards/e/EarlyFrost.java @@ -1,4 +1,3 @@ - package mage.cards.e; import java.util.UUID; @@ -6,7 +5,6 @@ import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.filter.common.FilterLandPermanent; import mage.target.common.TargetLandPermanent; /** @@ -21,7 +19,7 @@ public final class EarlyFrost extends CardImpl { // Tap up to three target lands. this.getSpellAbility().addEffect(new TapTargetEffect()); - this.getSpellAbility().addTarget(new TargetLandPermanent(0, 3, new FilterLandPermanent(), false)); + this.getSpellAbility().addTarget(new TargetLandPermanent(0, 3)); } private EarlyFrost(final EarlyFrost card) { diff --git a/Mage.Sets/src/mage/cards/e/EllynHarbreezeBusybody.java b/Mage.Sets/src/mage/cards/e/EllynHarbreezeBusybody.java index 405d284179d..d0797660f03 100644 --- a/Mage.Sets/src/mage/cards/e/EllynHarbreezeBusybody.java +++ b/Mage.Sets/src/mage/cards/e/EllynHarbreezeBusybody.java @@ -6,10 +6,10 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.dynamicvalue.common.TokensCreatedThisTurnCount; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.SuperType; import mage.watchers.common.CreatedTokenWatcher; @@ -25,16 +25,13 @@ public final class EllynHarbreezeBusybody extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}"); this.addSuperType(SuperType.LEGENDARY); - this.subtype.add(SubType.HUMAN); - this.subtype.add(SubType.PEASANT); + this.subtype.add(SubType.HUMAN, SubType.PEASANT); this.power = new MageInt(2); this.toughness = new MageInt(4); // {T}: Look at the top X cards of your library, where X is the number of tokens you created this turn. Put one of those cards into your hand and the rest on the bottom of your library in a random order. this.addAbility(new SimpleActivatedAbility(new LookLibraryAndPickControllerEffect( - TokensCreatedThisTurnCount.instance, 1, - LookLibraryControllerEffect.PutCards.HAND, - LookLibraryControllerEffect.PutCards.BOTTOM_RANDOM + TokensCreatedThisTurnCount.instance, 1, PutCards.HAND, PutCards.BOTTOM_RANDOM ), new TapSourceCost()).addHint(TokensCreatedThisTurnCount.getHint()), new CreatedTokenWatcher()); // Choose a Background diff --git a/Mage.Sets/src/mage/cards/e/ElvishRejuvenator.java b/Mage.Sets/src/mage/cards/e/ElvishRejuvenator.java index 328ec0bfcc5..893573ccdc9 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishRejuvenator.java +++ b/Mage.Sets/src/mage/cards/e/ElvishRejuvenator.java @@ -4,10 +4,10 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/f/FaerieMechanist.java b/Mage.Sets/src/mage/cards/f/FaerieMechanist.java index a5c66331411..e9b2bff7ee1 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieMechanist.java +++ b/Mage.Sets/src/mage/cards/f/FaerieMechanist.java @@ -4,11 +4,11 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; @@ -21,10 +21,9 @@ public final class FaerieMechanist extends CardImpl { public FaerieMechanist(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{3}{U}"); - this.subtype.add(SubType.FAERIE); - this.subtype.add(SubType.ARTIFICER); - this.power = new MageInt(2); - this.toughness = new MageInt(2); + this.subtype.add(SubType.FAERIE, SubType.ARTIFICER); + this.power = new MageInt(2); + this.toughness = new MageInt(2); // Flying this.addAbility(FlyingAbility.getInstance()); // When Faerie Mechanist enters the battlefield, look at the top three cards of your library. diff --git a/Mage.Sets/src/mage/cards/f/FirjaJudgeOfValor.java b/Mage.Sets/src/mage/cards/f/FirjaJudgeOfValor.java index 92d267fadce..ff10f61fe36 100644 --- a/Mage.Sets/src/mage/cards/f/FirjaJudgeOfValor.java +++ b/Mage.Sets/src/mage/cards/f/FirjaJudgeOfValor.java @@ -3,12 +3,12 @@ package mage.cards.f; import mage.MageInt; import mage.abilities.common.CastSecondSpellTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.SuperType; diff --git a/Mage.Sets/src/mage/cards/f/FlashOfInsight.java b/Mage.Sets/src/mage/cards/f/FlashOfInsight.java index 8d03d4fff0b..2ff903d45a9 100644 --- a/Mage.Sets/src/mage/cards/f/FlashOfInsight.java +++ b/Mage.Sets/src/mage/cards/f/FlashOfInsight.java @@ -8,11 +8,11 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/f/FloriferousVinewall.java b/Mage.Sets/src/mage/cards/f/FloriferousVinewall.java index f42db3fb418..dedca826c21 100644 --- a/Mage.Sets/src/mage/cards/f/FloriferousVinewall.java +++ b/Mage.Sets/src/mage/cards/f/FloriferousVinewall.java @@ -4,12 +4,12 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; -import mage.constants.SubType; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; +import mage.constants.SubType; import mage.filter.StaticFilters; /** @@ -21,8 +21,7 @@ public final class FloriferousVinewall extends CardImpl { public FloriferousVinewall(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}"); - this.subtype.add(SubType.PLANT); - this.subtype.add(SubType.WALL); + this.subtype.add(SubType.PLANT, SubType.WALL); this.power = new MageInt(0); this.toughness = new MageInt(2); @@ -30,10 +29,9 @@ public final class FloriferousVinewall extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // When Floriferous Vinewall enters the battlefield, look at the top six cards of your library. You may reveal a land card from among them and put it into your hand. Put the rest on the bottom of your library in a random order. - this.addAbility(new EntersBattlefieldTriggeredAbility( - new LookLibraryAndPickControllerEffect(6, 1, StaticFilters.FILTER_CARD_LAND, - LookLibraryControllerEffect.PutCards.HAND, LookLibraryControllerEffect.PutCards.BOTTOM_RANDOM) - )); + this.addAbility(new EntersBattlefieldTriggeredAbility(new LookLibraryAndPickControllerEffect( + 6, 1, StaticFilters.FILTER_CARD_LAND, PutCards.HAND, PutCards.BOTTOM_RANDOM + ))); } private FloriferousVinewall(final FloriferousVinewall card) { diff --git a/Mage.Sets/src/mage/cards/f/ForbiddenAlchemy.java b/Mage.Sets/src/mage/cards/f/ForbiddenAlchemy.java index 1e518ad9ef2..e7afc783aeb 100644 --- a/Mage.Sets/src/mage/cards/f/ForbiddenAlchemy.java +++ b/Mage.Sets/src/mage/cards/f/ForbiddenAlchemy.java @@ -3,11 +3,11 @@ package mage.cards.f; import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; /** * diff --git a/Mage.Sets/src/mage/cards/f/FoulEmissary.java b/Mage.Sets/src/mage/cards/f/FoulEmissary.java index 16b296551e2..9ea96a447c5 100644 --- a/Mage.Sets/src/mage/cards/f/FoulEmissary.java +++ b/Mage.Sets/src/mage/cards/f/FoulEmissary.java @@ -4,14 +4,13 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SacrificeSourceTriggeredAbility; -import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.EmergeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; import mage.game.Game; @@ -27,8 +26,7 @@ public final class FoulEmissary extends CardImpl { public FoulEmissary(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); - this.subtype.add(SubType.HUMAN); - this.subtype.add(SubType.HORROR); + this.subtype.add(SubType.HUMAN, SubType.HORROR); this.power = new MageInt(1); this.toughness = new MageInt(1); @@ -37,7 +35,7 @@ public final class FoulEmissary extends CardImpl { 4, 1, StaticFilters.FILTER_CARD_CREATURE_A, PutCards.HAND, PutCards.BOTTOM_ANY))); // When you sacrifice Foul Emissary while casting a spell with emerge, create a 3/2 colorless Eldrazi Horror creature token. - this.addAbility(new FoulEmissaryTriggeredAbility(new CreateTokenEffect(new EldraziHorrorToken()), false)); + this.addAbility(new FoulEmissaryTriggeredAbility()); } private FoulEmissary(final FoulEmissary card) { @@ -52,8 +50,9 @@ public final class FoulEmissary extends CardImpl { class FoulEmissaryTriggeredAbility extends SacrificeSourceTriggeredAbility { - public FoulEmissaryTriggeredAbility(Effect effect, boolean optional) { - super(effect, optional); + public FoulEmissaryTriggeredAbility() { + super(new CreateTokenEffect(new EldraziHorrorToken()), false); + setTriggerPhrase("When you sacrifice {this} while casting a spell with emerge, "); } public FoulEmissaryTriggeredAbility(final FoulEmissaryTriggeredAbility ability) { @@ -73,9 +72,4 @@ class FoulEmissaryTriggeredAbility extends SacrificeSourceTriggeredAbility { public FoulEmissaryTriggeredAbility copy() { return new FoulEmissaryTriggeredAbility(this); } - - @Override - public String getRule() { - return "When you sacrifice {this} while casting a spell with emerge, create a 3/2 colorless Eldrazi Horror creature token."; - } } diff --git a/Mage.Sets/src/mage/cards/g/GarruksHarbinger.java b/Mage.Sets/src/mage/cards/g/GarruksHarbinger.java index 76aa2ff778f..cee359f79f0 100644 --- a/Mage.Sets/src/mage/cards/g/GarruksHarbinger.java +++ b/Mage.Sets/src/mage/cards/g/GarruksHarbinger.java @@ -4,11 +4,11 @@ import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.dynamicvalue.common.SavedDamageValue; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.HexproofFromBlackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; diff --git a/Mage.Sets/src/mage/cards/g/GatherThePack.java b/Mage.Sets/src/mage/cards/g/GatherThePack.java index f5a462cbe3e..330de3d9745 100644 --- a/Mage.Sets/src/mage/cards/g/GatherThePack.java +++ b/Mage.Sets/src/mage/cards/g/GatherThePack.java @@ -3,12 +3,12 @@ package mage.cards.g; import java.util.UUID; import mage.abilities.condition.common.SpellMasteryCondition; import mage.abilities.decorator.ConditionalOneShotEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; /** diff --git a/Mage.Sets/src/mage/cards/g/GavonyDawnguard.java b/Mage.Sets/src/mage/cards/g/GavonyDawnguard.java index a28ac559293..698a197dd2d 100644 --- a/Mage.Sets/src/mage/cards/g/GavonyDawnguard.java +++ b/Mage.Sets/src/mage/cards/g/GavonyDawnguard.java @@ -5,12 +5,12 @@ import mage.abilities.common.BecomeDayAsEntersAbility; import mage.abilities.common.BecomesDayOrNightTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.WardAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; diff --git a/Mage.Sets/src/mage/cards/g/GenesisUltimatum.java b/Mage.Sets/src/mage/cards/g/GenesisUltimatum.java index bc52296d2c8..9471e08a80b 100644 --- a/Mage.Sets/src/mage/cards/g/GenesisUltimatum.java +++ b/Mage.Sets/src/mage/cards/g/GenesisUltimatum.java @@ -1,11 +1,11 @@ package mage.cards.g; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.ExileSpellEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.common.FilterPermanentCard; diff --git a/Mage.Sets/src/mage/cards/g/GlacialRevelation.java b/Mage.Sets/src/mage/cards/g/GlacialRevelation.java index 18da214a7c3..60b39b1ca3f 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialRevelation.java +++ b/Mage.Sets/src/mage/cards/g/GlacialRevelation.java @@ -1,10 +1,10 @@ package mage.cards.g; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.common.FilterPermanentCard; diff --git a/Mage.Sets/src/mage/cards/g/GlimpseTheCosmos.java b/Mage.Sets/src/mage/cards/g/GlimpseTheCosmos.java index 67ef251b584..423b071e202 100644 --- a/Mage.Sets/src/mage/cards/g/GlimpseTheCosmos.java +++ b/Mage.Sets/src/mage/cards/g/GlimpseTheCosmos.java @@ -6,7 +6,6 @@ import mage.abilities.Ability; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; diff --git a/Mage.Sets/src/mage/cards/g/GlimpseTheFuture.java b/Mage.Sets/src/mage/cards/g/GlimpseTheFuture.java index 3cbac75e0cc..c32c485d4e3 100644 --- a/Mage.Sets/src/mage/cards/g/GlimpseTheFuture.java +++ b/Mage.Sets/src/mage/cards/g/GlimpseTheFuture.java @@ -2,10 +2,10 @@ package mage.cards.g; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; /** * diff --git a/Mage.Sets/src/mage/cards/g/GlintNestCrane.java b/Mage.Sets/src/mage/cards/g/GlintNestCrane.java index 0edbeddcb23..66499a047c0 100644 --- a/Mage.Sets/src/mage/cards/g/GlintNestCrane.java +++ b/Mage.Sets/src/mage/cards/g/GlintNestCrane.java @@ -4,11 +4,11 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/g/GrimFlayer.java b/Mage.Sets/src/mage/cards/g/GrimFlayer.java index e145da19f8c..9a3f6705530 100644 --- a/Mage.Sets/src/mage/cards/g/GrimFlayer.java +++ b/Mage.Sets/src/mage/cards/g/GrimFlayer.java @@ -8,16 +8,12 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.DeliriumCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.hint.common.CardTypesInGraveyardHint; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AbilityWord; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SubType; +import mage.constants.*; /** * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GrislySalvage.java b/Mage.Sets/src/mage/cards/g/GrislySalvage.java index 2ab1d716f62..297660f66cb 100644 --- a/Mage.Sets/src/mage/cards/g/GrislySalvage.java +++ b/Mage.Sets/src/mage/cards/g/GrislySalvage.java @@ -2,11 +2,11 @@ package mage.cards.g; import java.util.UUID; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; /** diff --git a/Mage.Sets/src/mage/cards/g/GrowingRitesOfItlimoc.java b/Mage.Sets/src/mage/cards/g/GrowingRitesOfItlimoc.java index c39a4047953..c21270ebce0 100644 --- a/Mage.Sets/src/mage/cards/g/GrowingRitesOfItlimoc.java +++ b/Mage.Sets/src/mage/cards/g/GrowingRitesOfItlimoc.java @@ -7,15 +7,11 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ComparisonType; -import mage.constants.SuperType; -import mage.constants.TargetController; +import mage.constants.*; import mage.filter.StaticFilters; /** diff --git a/Mage.Sets/src/mage/cards/g/GurmagDrowner.java b/Mage.Sets/src/mage/cards/g/GurmagDrowner.java index 93cb5bef3a7..2e07cf1e859 100644 --- a/Mage.Sets/src/mage/cards/g/GurmagDrowner.java +++ b/Mage.Sets/src/mage/cards/g/GurmagDrowner.java @@ -4,11 +4,11 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.ExploitCreatureTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.ExploitAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; /** diff --git a/Mage.Sets/src/mage/cards/h/HaraldKingOfSkemfar.java b/Mage.Sets/src/mage/cards/h/HaraldKingOfSkemfar.java index 65586694fc0..fa4b67d7594 100644 --- a/Mage.Sets/src/mage/cards/h/HaraldKingOfSkemfar.java +++ b/Mage.Sets/src/mage/cards/h/HaraldKingOfSkemfar.java @@ -3,11 +3,11 @@ package mage.cards.h; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.MenaceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/cards/h/HatcherySpider.java b/Mage.Sets/src/mage/cards/h/HatcherySpider.java index 93e9e7591ff..9637e0d9197 100644 --- a/Mage.Sets/src/mage/cards/h/HatcherySpider.java +++ b/Mage.Sets/src/mage/cards/h/HatcherySpider.java @@ -5,7 +5,6 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CastSourceTriggeredAbility; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/cards/h/HeroesPodium.java b/Mage.Sets/src/mage/cards/h/HeroesPodium.java index ae30add9fc2..55b0fbc2484 100644 --- a/Mage.Sets/src/mage/cards/h/HeroesPodium.java +++ b/Mage.Sets/src/mage/cards/h/HeroesPodium.java @@ -10,12 +10,12 @@ import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.PutCards; import mage.constants.SuperType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureCard; diff --git a/Mage.Sets/src/mage/cards/i/IconOfAncestry.java b/Mage.Sets/src/mage/cards/i/IconOfAncestry.java index 57ff868cd12..6f3db00803f 100644 --- a/Mage.Sets/src/mage/cards/i/IconOfAncestry.java +++ b/Mage.Sets/src/mage/cards/i/IconOfAncestry.java @@ -9,7 +9,6 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ChooseCreatureTypeEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; diff --git a/Mage.Sets/src/mage/cards/i/Impulse.java b/Mage.Sets/src/mage/cards/i/Impulse.java index 23a5e015893..1897876f92f 100644 --- a/Mage.Sets/src/mage/cards/i/Impulse.java +++ b/Mage.Sets/src/mage/cards/i/Impulse.java @@ -2,10 +2,10 @@ package mage.cards.i; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; /** * diff --git a/Mage.Sets/src/mage/cards/i/IncubationIncongruity.java b/Mage.Sets/src/mage/cards/i/IncubationIncongruity.java index 5ef822d0757..6b4e623e15f 100644 --- a/Mage.Sets/src/mage/cards/i/IncubationIncongruity.java +++ b/Mage.Sets/src/mage/cards/i/IncubationIncongruity.java @@ -4,11 +4,11 @@ import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardSetInfo; import mage.cards.SplitCard; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.PutCards; import mage.constants.SpellAbilityType; import mage.filter.StaticFilters; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/i/IngeniousSmith.java b/Mage.Sets/src/mage/cards/i/IngeniousSmith.java index a2cb43b3d2b..9a701b37801 100644 --- a/Mage.Sets/src/mage/cards/i/IngeniousSmith.java +++ b/Mage.Sets/src/mage/cards/i/IngeniousSmith.java @@ -5,11 +5,11 @@ import mage.MageInt; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/j/JaceTheLivingGuildpact.java b/Mage.Sets/src/mage/cards/j/JaceTheLivingGuildpact.java index f79268e9ec2..62113b31fc6 100644 --- a/Mage.Sets/src/mage/cards/j/JaceTheLivingGuildpact.java +++ b/Mage.Sets/src/mage/cards/j/JaceTheLivingGuildpact.java @@ -4,12 +4,12 @@ import java.util.UUID; import mage.abilities.LoyaltyAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.effects.common.ShuffleHandGraveyardAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/cards/j/JarOfEyeballs.java b/Mage.Sets/src/mage/cards/j/JarOfEyeballs.java index 9bceed2e19d..2d7a8242d2a 100644 --- a/Mage.Sets/src/mage/cards/j/JarOfEyeballs.java +++ b/Mage.Sets/src/mage/cards/j/JarOfEyeballs.java @@ -10,11 +10,11 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/k/KeskitTheFleshSculptor.java b/Mage.Sets/src/mage/cards/k/KeskitTheFleshSculptor.java index 862b79d8209..0b9518f566f 100644 --- a/Mage.Sets/src/mage/cards/k/KeskitTheFleshSculptor.java +++ b/Mage.Sets/src/mage/cards/k/KeskitTheFleshSculptor.java @@ -6,11 +6,11 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.PartnerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/k/KinnanBonderProdigy.java b/Mage.Sets/src/mage/cards/k/KinnanBonderProdigy.java index 66fd0b0792b..361afc7a6a1 100644 --- a/Mage.Sets/src/mage/cards/k/KinnanBonderProdigy.java +++ b/Mage.Sets/src/mage/cards/k/KinnanBonderProdigy.java @@ -5,7 +5,6 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.TapForManaAllTriggeredManaAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.mana.AddManaOfAnyTypeProducedEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; diff --git a/Mage.Sets/src/mage/cards/k/KolvoriGodOfKinship.java b/Mage.Sets/src/mage/cards/k/KolvoriGodOfKinship.java index 2a1cc5831b6..d75947328fc 100644 --- a/Mage.Sets/src/mage/cards/k/KolvoriGodOfKinship.java +++ b/Mage.Sets/src/mage/cards/k/KolvoriGodOfKinship.java @@ -17,7 +17,6 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.ChooseCreatureTypeEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.VigilanceAbility; diff --git a/Mage.Sets/src/mage/cards/k/KrosanRestorer.java b/Mage.Sets/src/mage/cards/k/KrosanRestorer.java index 1056f5bbccb..a6f2c4e028b 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanRestorer.java +++ b/Mage.Sets/src/mage/cards/k/KrosanRestorer.java @@ -1,4 +1,3 @@ - package mage.cards.k; import java.util.UUID; @@ -15,7 +14,6 @@ import mage.constants.AbilityWord; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.filter.common.FilterLandPermanent; import mage.target.common.TargetLandPermanent; /** @@ -41,7 +39,7 @@ public final class KrosanRestorer extends CardImpl { new UntapTargetEffect(), new TapSourceCost(), new CardsInControllerGraveyardCondition(7)); - ability.addTarget(new TargetLandPermanent(0, 3, new FilterLandPermanent(), false)); + ability.addTarget(new TargetLandPermanent(0, 3)); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KruphixsInsight.java b/Mage.Sets/src/mage/cards/k/KruphixsInsight.java index 7d9103fa6fa..a8339e6a364 100644 --- a/Mage.Sets/src/mage/cards/k/KruphixsInsight.java +++ b/Mage.Sets/src/mage/cards/k/KruphixsInsight.java @@ -2,11 +2,11 @@ package mage.cards.k; import java.util.UUID; import mage.abilities.effects.Effect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; /** diff --git a/Mage.Sets/src/mage/cards/l/LavaballTrap.java b/Mage.Sets/src/mage/cards/l/LavaballTrap.java index 39fc3991380..2b92d719726 100644 --- a/Mage.Sets/src/mage/cards/l/LavaballTrap.java +++ b/Mage.Sets/src/mage/cards/l/LavaballTrap.java @@ -1,4 +1,3 @@ - package mage.cards.l; import mage.abilities.Ability; @@ -12,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.StaticFilters; -import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -37,9 +35,8 @@ public final class LavaballTrap extends CardImpl { // Destroy two target lands. Lavaball Trap deals 4 damage to each creature. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addEffect(new DamageAllEffect(4, new FilterCreaturePermanent())); - this.getSpellAbility().addTarget(new TargetLandPermanent(2, 2, StaticFilters.FILTER_LANDS, false)); - + this.getSpellAbility().addEffect(new DamageAllEffect(4, StaticFilters.FILTER_PERMANENT_CREATURE)); + this.getSpellAbility().addTarget(new TargetLandPermanent(2)); } private LavaballTrap(final LavaballTrap card) { diff --git a/Mage.Sets/src/mage/cards/l/LeadTheStampede.java b/Mage.Sets/src/mage/cards/l/LeadTheStampede.java index 23840ef293e..947374e4489 100644 --- a/Mage.Sets/src/mage/cards/l/LeadTheStampede.java +++ b/Mage.Sets/src/mage/cards/l/LeadTheStampede.java @@ -2,10 +2,10 @@ package mage.cards.l; import mage.abilities.effects.Effect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/l/LilianasSpoils.java b/Mage.Sets/src/mage/cards/l/LilianasSpoils.java index 53ce1878388..273561540db 100644 --- a/Mage.Sets/src/mage/cards/l/LilianasSpoils.java +++ b/Mage.Sets/src/mage/cards/l/LilianasSpoils.java @@ -3,11 +3,11 @@ package mage.cards.l; import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetOpponent; diff --git a/Mage.Sets/src/mage/cards/l/LoneRevenant.java b/Mage.Sets/src/mage/cards/l/LoneRevenant.java index 0e5bf3f7e80..3250bcab753 100644 --- a/Mage.Sets/src/mage/cards/l/LoneRevenant.java +++ b/Mage.Sets/src/mage/cards/l/LoneRevenant.java @@ -7,12 +7,12 @@ import mage.abilities.condition.Condition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/m/Machinate.java b/Mage.Sets/src/mage/cards/m/Machinate.java index d5523806106..d875903e49a 100644 --- a/Mage.Sets/src/mage/cards/m/Machinate.java +++ b/Mage.Sets/src/mage/cards/m/Machinate.java @@ -3,12 +3,12 @@ package mage.cards.m; import java.util.UUID; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.Effect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; /** diff --git a/Mage.Sets/src/mage/cards/m/MaestrosCharm.java b/Mage.Sets/src/mage/cards/m/MaestrosCharm.java index 4539577dd4f..ced13b3df8b 100644 --- a/Mage.Sets/src/mage/cards/m/MaestrosCharm.java +++ b/Mage.Sets/src/mage/cards/m/MaestrosCharm.java @@ -4,11 +4,11 @@ import mage.abilities.Mode; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.LoseLifeOpponentsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.target.common.TargetCreatureOrPlaneswalker; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/m/MayaelTheAnima.java b/Mage.Sets/src/mage/cards/m/MayaelTheAnima.java index 048e4533e79..1ab7c03f608 100644 --- a/Mage.Sets/src/mage/cards/m/MayaelTheAnima.java +++ b/Mage.Sets/src/mage/cards/m/MayaelTheAnima.java @@ -1,4 +1,3 @@ - package mage.cards.m; import java.util.UUID; @@ -7,13 +6,9 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ComparisonType; -import mage.constants.SubType; -import mage.constants.SuperType; +import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.PowerPredicate; diff --git a/Mage.Sets/src/mage/cards/m/MeletisAstronomer.java b/Mage.Sets/src/mage/cards/m/MeletisAstronomer.java index 74c2d17d17b..e14e00e939b 100644 --- a/Mage.Sets/src/mage/cards/m/MeletisAstronomer.java +++ b/Mage.Sets/src/mage/cards/m/MeletisAstronomer.java @@ -3,11 +3,11 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.HeroicAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterEnchantmentCard; diff --git a/Mage.Sets/src/mage/cards/m/MemorialToUnity.java b/Mage.Sets/src/mage/cards/m/MemorialToUnity.java index 3303eb95e1e..18faa122dd0 100644 --- a/Mage.Sets/src/mage/cards/m/MemorialToUnity.java +++ b/Mage.Sets/src/mage/cards/m/MemorialToUnity.java @@ -7,11 +7,11 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/m/MemoryDeluge.java b/Mage.Sets/src/mage/cards/m/MemoryDeluge.java index c713c1bb139..5704a18e2e3 100644 --- a/Mage.Sets/src/mage/cards/m/MemoryDeluge.java +++ b/Mage.Sets/src/mage/cards/m/MemoryDeluge.java @@ -3,11 +3,11 @@ package mage.cards.m; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.ManaSpentToCastCount; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/m/MilitiaBugler.java b/Mage.Sets/src/mage/cards/m/MilitiaBugler.java index 6cdf4d5ecb3..2a71758ee81 100644 --- a/Mage.Sets/src/mage/cards/m/MilitiaBugler.java +++ b/Mage.Sets/src/mage/cards/m/MilitiaBugler.java @@ -3,12 +3,12 @@ package mage.cards.m; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.PowerPredicate; diff --git a/Mage.Sets/src/mage/cards/m/MundaAmbushLeader.java b/Mage.Sets/src/mage/cards/m/MundaAmbushLeader.java index 644b8144d59..6229535831e 100644 --- a/Mage.Sets/src/mage/cards/m/MundaAmbushLeader.java +++ b/Mage.Sets/src/mage/cards/m/MundaAmbushLeader.java @@ -5,11 +5,11 @@ import mage.MageInt; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/cards/n/NaelAvizoaAeronaut.java b/Mage.Sets/src/mage/cards/n/NaelAvizoaAeronaut.java index c71a54bda51..aa2ccd9d554 100644 --- a/Mage.Sets/src/mage/cards/n/NaelAvizoaAeronaut.java +++ b/Mage.Sets/src/mage/cards/n/NaelAvizoaAeronaut.java @@ -7,10 +7,9 @@ import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.hint.common.DomainHint; -import mage.constants.*; import mage.abilities.keyword.FlyingAbility; +import mage.constants.*; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.game.Game; @@ -26,8 +25,7 @@ public final class NaelAvizoaAeronaut extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{U}"); this.addSuperType(SuperType.LEGENDARY); - this.subtype.add(SubType.ELF); - this.subtype.add(SubType.SCOUT); + this.subtype.add(SubType.ELF, SubType.SCOUT); this.power = new MageInt(2); this.toughness = new MageInt(4); @@ -37,11 +35,7 @@ public final class NaelAvizoaAeronaut extends CardImpl { // Domain -- Whenever Nael, Avizoa Aeronaut deals combat damage to a player, look at the top X cards of your library, where X is the number of basic land types among lands you control. // Put up to one of them on top of your library and the rest on the bottom in a random order. Then if there are five basic land types among lands you control, draw a card. Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility( - new LookLibraryAndPickControllerEffect( - DomainValue.REGULAR, 1, - LookLibraryControllerEffect.PutCards.TOP_ANY, LookLibraryControllerEffect.PutCards.BOTTOM_RANDOM, - true - ), + new LookLibraryAndPickControllerEffect(DomainValue.REGULAR, 1, PutCards.TOP_ANY, PutCards.BOTTOM_RANDOM, true), false ); ability.addEffect(new NaelAvizoaAeronautEffect()); diff --git a/Mage.Sets/src/mage/cards/n/NagaOracle.java b/Mage.Sets/src/mage/cards/n/NagaOracle.java index 1f57bd3d922..3360b819f7b 100644 --- a/Mage.Sets/src/mage/cards/n/NagaOracle.java +++ b/Mage.Sets/src/mage/cards/n/NagaOracle.java @@ -4,10 +4,10 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; /** diff --git a/Mage.Sets/src/mage/cards/n/NaggingThoughts.java b/Mage.Sets/src/mage/cards/n/NaggingThoughts.java index 1d8fa65620c..d736a3045be 100644 --- a/Mage.Sets/src/mage/cards/n/NaggingThoughts.java +++ b/Mage.Sets/src/mage/cards/n/NaggingThoughts.java @@ -3,11 +3,11 @@ package mage.cards.n; import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.MadnessAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; /** * diff --git a/Mage.Sets/src/mage/cards/n/NahiriHeirOfTheAncients.java b/Mage.Sets/src/mage/cards/n/NahiriHeirOfTheAncients.java index 969bc16a968..78be9a36552 100644 --- a/Mage.Sets/src/mage/cards/n/NahiriHeirOfTheAncients.java +++ b/Mage.Sets/src/mage/cards/n/NahiriHeirOfTheAncients.java @@ -8,7 +8,6 @@ import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; diff --git a/Mage.Sets/src/mage/cards/n/NarsetParterOfVeils.java b/Mage.Sets/src/mage/cards/n/NarsetParterOfVeils.java index 19fde5784e0..12d10c22c35 100644 --- a/Mage.Sets/src/mage/cards/n/NarsetParterOfVeils.java +++ b/Mage.Sets/src/mage/cards/n/NarsetParterOfVeils.java @@ -5,7 +5,6 @@ import mage.abilities.LoyaltyAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; diff --git a/Mage.Sets/src/mage/cards/n/Necrosynthesis.java b/Mage.Sets/src/mage/cards/n/Necrosynthesis.java index f9549e80259..0cf34886515 100644 --- a/Mage.Sets/src/mage/cards/n/Necrosynthesis.java +++ b/Mage.Sets/src/mage/cards/n/Necrosynthesis.java @@ -8,7 +8,6 @@ import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.EnchantAbility; diff --git a/Mage.Sets/src/mage/cards/n/NessianGameWarden.java b/Mage.Sets/src/mage/cards/n/NessianGameWarden.java index 63a4aca5c46..5811f657a8c 100644 --- a/Mage.Sets/src/mage/cards/n/NessianGameWarden.java +++ b/Mage.Sets/src/mage/cards/n/NessianGameWarden.java @@ -6,10 +6,10 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/n/NessianWanderer.java b/Mage.Sets/src/mage/cards/n/NessianWanderer.java index 9cd28428e9b..c9c664ef2dd 100644 --- a/Mage.Sets/src/mage/cards/n/NessianWanderer.java +++ b/Mage.Sets/src/mage/cards/n/NessianWanderer.java @@ -3,10 +3,10 @@ package mage.cards.n; import mage.MageInt; import mage.abilities.abilityword.ConstellationAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/n/NissaGenesisMage.java b/Mage.Sets/src/mage/cards/n/NissaGenesisMage.java index d3d255eff1f..9c4cf60a361 100644 --- a/Mage.Sets/src/mage/cards/n/NissaGenesisMage.java +++ b/Mage.Sets/src/mage/cards/n/NissaGenesisMage.java @@ -5,17 +5,12 @@ import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; 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.constants.*; import mage.filter.FilterCard; -import mage.filter.StaticFilters; import mage.filter.predicate.Predicates; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetLandPermanent; @@ -47,8 +42,8 @@ public final class NissaGenesisMage extends CardImpl { Effect effect = new UntapTargetEffect("untap up to two target creatures and up to two target lands"); effect.setTargetPointer(new EachTargetPointer()); Ability ability = new LoyaltyAbility(effect, +2); - ability.addTarget(new TargetCreaturePermanent(0, 2, StaticFilters.FILTER_PERMANENT_CREATURES, false)); - ability.addTarget(new TargetLandPermanent(0, 2, StaticFilters.FILTER_LANDS, false)); + ability.addTarget(new TargetCreaturePermanent(0, 2)); + ability.addTarget(new TargetLandPermanent(0, 2)); this.addAbility(ability); //-3: Target creature gets +5/+5 until end of turn. diff --git a/Mage.Sets/src/mage/cards/n/NissaSageAnimist.java b/Mage.Sets/src/mage/cards/n/NissaSageAnimist.java index 6c2afa68a13..d57530b12ea 100644 --- a/Mage.Sets/src/mage/cards/n/NissaSageAnimist.java +++ b/Mage.Sets/src/mage/cards/n/NissaSageAnimist.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.CardsImpl; import mage.constants.*; -import mage.filter.StaticFilters; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.NissaSageAnimistToken; @@ -47,7 +46,7 @@ public final class NissaSageAnimist extends CardImpl { // -7: Untap up to six target lands. They become 6/6 Elemental creatures. They're still lands. Ability ability = new LoyaltyAbility(new UntapTargetEffect(), -7); - ability.addTarget(new TargetLandPermanent(0, 6, StaticFilters.FILTER_LAND, false)); + ability.addTarget(new TargetLandPermanent(0, 6)); ability.addEffect(new NissaSageAnimistMinusAnimateEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NumotTheDevastator.java b/Mage.Sets/src/mage/cards/n/NumotTheDevastator.java index 38a1e9fd8a2..108c0651cbf 100644 --- a/Mage.Sets/src/mage/cards/n/NumotTheDevastator.java +++ b/Mage.Sets/src/mage/cards/n/NumotTheDevastator.java @@ -1,4 +1,3 @@ - package mage.cards.n; import java.util.UUID; @@ -15,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.filter.StaticFilters; import mage.target.common.TargetLandPermanent; /** @@ -39,7 +37,7 @@ public final class NumotTheDevastator extends CardImpl { effect.setText("destroy up to two target lands"); Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility( new DoIfCostPaid(effect, new ManaCostsImpl<>("{2}{R}")), false); - ability.addTarget(new TargetLandPermanent(0, 2, StaticFilters.FILTER_LANDS, false)); + ability.addTarget(new TargetLandPermanent(0, 2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NymrisOonasTrickster.java b/Mage.Sets/src/mage/cards/n/NymrisOonasTrickster.java index 06b8ee0f064..fa85c346e28 100644 --- a/Mage.Sets/src/mage/cards/n/NymrisOonasTrickster.java +++ b/Mage.Sets/src/mage/cards/n/NymrisOonasTrickster.java @@ -3,12 +3,12 @@ package mage.cards.n; import mage.MageInt; import mage.abilities.common.FirstSpellOpponentsTurnTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; 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.PutCards; import mage.constants.SubType; import mage.constants.SuperType; diff --git a/Mage.Sets/src/mage/cards/o/OathOfNissa.java b/Mage.Sets/src/mage/cards/o/OathOfNissa.java index 7a2efc70754..22a047f8449 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfNissa.java +++ b/Mage.Sets/src/mage/cards/o/OathOfNissa.java @@ -7,7 +7,6 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.AsThoughEffectImpl; import mage.abilities.effects.AsThoughManaEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; diff --git a/Mage.Sets/src/mage/cards/o/OnceUponATime.java b/Mage.Sets/src/mage/cards/o/OnceUponATime.java index 041e220c258..21443197261 100644 --- a/Mage.Sets/src/mage/cards/o/OnceUponATime.java +++ b/Mage.Sets/src/mage/cards/o/OnceUponATime.java @@ -4,10 +4,10 @@ import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.WatcherScope; import mage.filter.StaticFilters; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/o/OrbOfDragonkind.java b/Mage.Sets/src/mage/cards/o/OrbOfDragonkind.java index 089f8a0ae62..368099f4a85 100644 --- a/Mage.Sets/src/mage/cards/o/OrbOfDragonkind.java +++ b/Mage.Sets/src/mage/cards/o/OrbOfDragonkind.java @@ -11,13 +11,13 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.mana.ConditionalAnyColorManaAbility; import mage.abilities.mana.builder.ConditionalManaBuilder; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ColoredManaSymbol; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/o/OrganHoarder.java b/Mage.Sets/src/mage/cards/o/OrganHoarder.java index 02f6c9468bd..98c73727424 100644 --- a/Mage.Sets/src/mage/cards/o/OrganHoarder.java +++ b/Mage.Sets/src/mage/cards/o/OrganHoarder.java @@ -3,10 +3,10 @@ package mage.cards.o; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/o/OtherworldlyGaze.java b/Mage.Sets/src/mage/cards/o/OtherworldlyGaze.java index 7cbb0193113..00b18319f7f 100644 --- a/Mage.Sets/src/mage/cards/o/OtherworldlyGaze.java +++ b/Mage.Sets/src/mage/cards/o/OtherworldlyGaze.java @@ -2,11 +2,11 @@ package mage.cards.o; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/p/PeerThroughDepths.java b/Mage.Sets/src/mage/cards/p/PeerThroughDepths.java index 3213b29761c..549a2cfdd29 100644 --- a/Mage.Sets/src/mage/cards/p/PeerThroughDepths.java +++ b/Mage.Sets/src/mage/cards/p/PeerThroughDepths.java @@ -1,10 +1,10 @@ package mage.cards.p; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; diff --git a/Mage.Sets/src/mage/cards/p/Petradon.java b/Mage.Sets/src/mage/cards/p/Petradon.java index 0da5daa8fd2..bcd74d8c872 100644 --- a/Mage.Sets/src/mage/cards/p/Petradon.java +++ b/Mage.Sets/src/mage/cards/p/Petradon.java @@ -34,7 +34,7 @@ public final class Petradon extends CardImpl { // When Petradon enters the battlefield, exile two target lands. Ability ability = new EntersBattlefieldTriggeredAbility(new ExileTargetForSourceEffect(), false); - ability.addTarget(new TargetLandPermanent(2, 2, StaticFilters.FILTER_LANDS, false)); + ability.addTarget(new TargetLandPermanent(2)); this.addAbility(ability); // When Petradon leaves the battlefield, return the exiled cards to the battlefield under their owners' control. diff --git a/Mage.Sets/src/mage/cards/p/PiecesOfThePuzzle.java b/Mage.Sets/src/mage/cards/p/PiecesOfThePuzzle.java index af1bc7a5c5f..e8a11826f21 100644 --- a/Mage.Sets/src/mage/cards/p/PiecesOfThePuzzle.java +++ b/Mage.Sets/src/mage/cards/p/PiecesOfThePuzzle.java @@ -2,11 +2,11 @@ package mage.cards.p; import java.util.UUID; import mage.abilities.effects.Effect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; diff --git a/Mage.Sets/src/mage/cards/p/PlowUnder.java b/Mage.Sets/src/mage/cards/p/PlowUnder.java index 31412ff2349..6f57791dc25 100644 --- a/Mage.Sets/src/mage/cards/p/PlowUnder.java +++ b/Mage.Sets/src/mage/cards/p/PlowUnder.java @@ -1,4 +1,3 @@ - package mage.cards.p; import java.util.UUID; @@ -6,7 +5,6 @@ import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.filter.StaticFilters; import mage.target.common.TargetLandPermanent; /** @@ -21,7 +19,7 @@ public final class PlowUnder extends CardImpl { // Put two target lands on top of their owners' libraries. this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); - this.getSpellAbility().addTarget(new TargetLandPermanent(2,2, StaticFilters.FILTER_LANDS, false)); + this.getSpellAbility().addTarget(new TargetLandPermanent(2)); } private PlowUnder(final PlowUnder card) { diff --git a/Mage.Sets/src/mage/cards/p/PreferredSelection.java b/Mage.Sets/src/mage/cards/p/PreferredSelection.java index f020d5f41ee..e3802b446af 100644 --- a/Mage.Sets/src/mage/cards/p/PreferredSelection.java +++ b/Mage.Sets/src/mage/cards/p/PreferredSelection.java @@ -9,13 +9,13 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.Cards; import mage.cards.CardsImpl; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.PutCards; import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/p/ProfessorOnyx.java b/Mage.Sets/src/mage/cards/p/ProfessorOnyx.java index b5f4a36bd55..d9688f2fd6d 100644 --- a/Mage.Sets/src/mage/cards/p/ProfessorOnyx.java +++ b/Mage.Sets/src/mage/cards/p/ProfessorOnyx.java @@ -8,7 +8,6 @@ import mage.abilities.common.MagecraftAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.LoseLifeOpponentsEffect; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.abilities.effects.common.SacrificeOpponentsEffect; diff --git a/Mage.Sets/src/mage/cards/p/PropheticBolt.java b/Mage.Sets/src/mage/cards/p/PropheticBolt.java index d52add9501e..7350ca11da9 100644 --- a/Mage.Sets/src/mage/cards/p/PropheticBolt.java +++ b/Mage.Sets/src/mage/cards/p/PropheticBolt.java @@ -3,10 +3,10 @@ package mage.cards.p; import java.util.UUID; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.target.common.TargetAnyTarget; /** diff --git a/Mage.Sets/src/mage/cards/p/PropheticTitan.java b/Mage.Sets/src/mage/cards/p/PropheticTitan.java index eda7d02bfba..8edc084f090 100644 --- a/Mage.Sets/src/mage/cards/p/PropheticTitan.java +++ b/Mage.Sets/src/mage/cards/p/PropheticTitan.java @@ -6,12 +6,12 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.DeliriumCondition; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.hint.common.CardTypesInGraveyardHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage.Sets/src/mage/cards/q/QuandrixApprentice.java b/Mage.Sets/src/mage/cards/q/QuandrixApprentice.java index 93d6e53ad55..5b4da1e8c95 100644 --- a/Mage.Sets/src/mage/cards/q/QuandrixApprentice.java +++ b/Mage.Sets/src/mage/cards/q/QuandrixApprentice.java @@ -3,10 +3,10 @@ package mage.cards.q; import mage.MageInt; import mage.abilities.common.MagecraftAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/r/RalIzzetViceroy.java b/Mage.Sets/src/mage/cards/r/RalIzzetViceroy.java index ce751defc3c..9b3e5c41d4c 100644 --- a/Mage.Sets/src/mage/cards/r/RalIzzetViceroy.java +++ b/Mage.Sets/src/mage/cards/r/RalIzzetViceroy.java @@ -6,12 +6,12 @@ import mage.abilities.dynamicvalue.common.InstantSorceryExileGraveyardCount; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.GetEmblemEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.hint.Hint; import mage.abilities.hint.ValueHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.SuperType; import mage.game.command.emblems.RalIzzetViceroyEmblem; diff --git a/Mage.Sets/src/mage/cards/r/RalsOutburst.java b/Mage.Sets/src/mage/cards/r/RalsOutburst.java index af16157c2b5..ce3751323b3 100644 --- a/Mage.Sets/src/mage/cards/r/RalsOutburst.java +++ b/Mage.Sets/src/mage/cards/r/RalsOutburst.java @@ -2,10 +2,10 @@ package mage.cards.r; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.target.common.TargetAnyTarget; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/r/RansackTheLab.java b/Mage.Sets/src/mage/cards/r/RansackTheLab.java index 047fe23ddb9..198bd02dfc3 100644 --- a/Mage.Sets/src/mage/cards/r/RansackTheLab.java +++ b/Mage.Sets/src/mage/cards/r/RansackTheLab.java @@ -1,10 +1,10 @@ package mage.cards.r; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/r/RavenFamiliar.java b/Mage.Sets/src/mage/cards/r/RavenFamiliar.java index 87b38a3bd4f..1e09fc10283 100644 --- a/Mage.Sets/src/mage/cards/r/RavenFamiliar.java +++ b/Mage.Sets/src/mage/cards/r/RavenFamiliar.java @@ -4,12 +4,12 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.EchoAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; /** diff --git a/Mage.Sets/src/mage/cards/r/RealityHeist.java b/Mage.Sets/src/mage/cards/r/RealityHeist.java index 395f1864f63..2c149e98b8c 100644 --- a/Mage.Sets/src/mage/cards/r/RealityHeist.java +++ b/Mage.Sets/src/mage/cards/r/RealityHeist.java @@ -3,12 +3,12 @@ package mage.cards.r; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.ArtifactYouControlCount; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.cost.SpellCostReductionForEachSourceEffect; import mage.abilities.hint.common.ArtifactYouControlHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.Zone; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/r/RecruitmentOfficer.java b/Mage.Sets/src/mage/cards/r/RecruitmentOfficer.java index 0d5df69e503..25ca0bc7aa1 100644 --- a/Mage.Sets/src/mage/cards/r/RecruitmentOfficer.java +++ b/Mage.Sets/src/mage/cards/r/RecruitmentOfficer.java @@ -4,11 +4,11 @@ import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; @@ -30,16 +30,13 @@ public final class RecruitmentOfficer extends CardImpl { public RecruitmentOfficer(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{W}"); - this.subtype.add(SubType.HUMAN); - this.subtype.add(SubType.SOLDIER); + this.subtype.add(SubType.HUMAN, SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(1); // {3}{W}: Look at the top four cards of your library. You may reveal a creature card with mana value 3 or less from among them and put it into your hand. Put the rest on the bottom of your library in a random order. this.addAbility(new SimpleActivatedAbility(new LookLibraryAndPickControllerEffect( - 4, 1, filter, - LookLibraryControllerEffect.PutCards.HAND, - LookLibraryControllerEffect.PutCards.BOTTOM_RANDOM + 4, 1, filter, PutCards.HAND, PutCards.BOTTOM_RANDOM ), new ManaCostsImpl<>("{3}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/s/SarkhansDragonfire.java b/Mage.Sets/src/mage/cards/s/SarkhansDragonfire.java index 68d78728e62..1f55bb039b8 100644 --- a/Mage.Sets/src/mage/cards/s/SarkhansDragonfire.java +++ b/Mage.Sets/src/mage/cards/s/SarkhansDragonfire.java @@ -4,10 +4,10 @@ import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetAnyTarget; diff --git a/Mage.Sets/src/mage/cards/s/SatoruUmezawa.java b/Mage.Sets/src/mage/cards/s/SatoruUmezawa.java index 8e9d715db43..f3be969d811 100644 --- a/Mage.Sets/src/mage/cards/s/SatoruUmezawa.java +++ b/Mage.Sets/src/mage/cards/s/SatoruUmezawa.java @@ -6,7 +6,6 @@ import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.NinjutsuAbility; import mage.cards.Card; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/cards/s/SatyrWayfinder.java b/Mage.Sets/src/mage/cards/s/SatyrWayfinder.java index bff86473e60..08b54dabffe 100644 --- a/Mage.Sets/src/mage/cards/s/SatyrWayfinder.java +++ b/Mage.Sets/src/mage/cards/s/SatyrWayfinder.java @@ -4,11 +4,11 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/s/ScatteredThoughts.java b/Mage.Sets/src/mage/cards/s/ScatteredThoughts.java index 494804c3547..bbceced9288 100644 --- a/Mage.Sets/src/mage/cards/s/ScatteredThoughts.java +++ b/Mage.Sets/src/mage/cards/s/ScatteredThoughts.java @@ -1,10 +1,10 @@ package mage.cards.s; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/s/ScionOfHalaster.java b/Mage.Sets/src/mage/cards/s/ScionOfHalaster.java index 9357d53e38e..1f3b011b1ed 100644 --- a/Mage.Sets/src/mage/cards/s/ScionOfHalaster.java +++ b/Mage.Sets/src/mage/cards/s/ScionOfHalaster.java @@ -4,7 +4,6 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -68,7 +67,7 @@ class ScionOfHalasterReplacementEffect extends ReplacementEffectImpl { @Override public boolean replaceEvent(GameEvent event, Ability source, Game game) { - new LookLibraryAndPickControllerEffect(2, 1, LookLibraryControllerEffect.PutCards.GRAVEYARD, LookLibraryControllerEffect.PutCards.TOP_ANY).apply(game, source); + new LookLibraryAndPickControllerEffect(2, 1, PutCards.GRAVEYARD, PutCards.TOP_ANY).apply(game, source); Player you = game.getPlayer(event.getPlayerId()); if (you != null) { you.drawCards(1, source, game, event); @@ -89,4 +88,4 @@ class ScionOfHalasterReplacementEffect extends ReplacementEffectImpl { CardsDrawnThisTurnWatcher watcher = game.getState().getWatcher(CardsDrawnThisTurnWatcher.class); return watcher != null && watcher.getCardsDrawnThisTurn(event.getPlayerId()) == 0; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/ScoutTheBorders.java b/Mage.Sets/src/mage/cards/s/ScoutTheBorders.java index fbf0a092825..52db9f23694 100644 --- a/Mage.Sets/src/mage/cards/s/ScoutTheBorders.java +++ b/Mage.Sets/src/mage/cards/s/ScoutTheBorders.java @@ -1,11 +1,11 @@ package mage.cards.s; import java.util.UUID; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; /** diff --git a/Mage.Sets/src/mage/cards/s/SeaGateOracle.java b/Mage.Sets/src/mage/cards/s/SeaGateOracle.java index 9f4ad41b7d0..ef4d47989de 100644 --- a/Mage.Sets/src/mage/cards/s/SeaGateOracle.java +++ b/Mage.Sets/src/mage/cards/s/SeaGateOracle.java @@ -4,10 +4,10 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; /** diff --git a/Mage.Sets/src/mage/cards/s/SeeTheUnwritten.java b/Mage.Sets/src/mage/cards/s/SeeTheUnwritten.java index b491278f6ef..a364be2e8de 100644 --- a/Mage.Sets/src/mage/cards/s/SeeTheUnwritten.java +++ b/Mage.Sets/src/mage/cards/s/SeeTheUnwritten.java @@ -2,13 +2,13 @@ package mage.cards.s; import mage.abilities.condition.common.FerociousCondition; import mage.abilities.decorator.ConditionalOneShotEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.abilities.hint.common.FerociousHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/s/SeekTheWilds.java b/Mage.Sets/src/mage/cards/s/SeekTheWilds.java index e7ed6ed28f7..81313d54880 100644 --- a/Mage.Sets/src/mage/cards/s/SeekTheWilds.java +++ b/Mage.Sets/src/mage/cards/s/SeekTheWilds.java @@ -2,10 +2,10 @@ package mage.cards.s; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; /** diff --git a/Mage.Sets/src/mage/cards/s/ShadowProphecy.java b/Mage.Sets/src/mage/cards/s/ShadowProphecy.java index 0be344f2f67..ae21a5e73c8 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowProphecy.java +++ b/Mage.Sets/src/mage/cards/s/ShadowProphecy.java @@ -2,13 +2,13 @@ package mage.cards.s; import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.abilities.hint.common.DomainHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; @@ -22,9 +22,7 @@ public final class ShadowProphecy extends CardImpl { // Domain - Look at the top X cards of your library, where X is the number of basic land types among lands you control. Put up to two of them into your hand and the rest into your graveyard. You lose 2 life. this.getSpellAbility().addEffect(new LookLibraryAndPickControllerEffect( - DomainValue.REGULAR, 2, - LookLibraryControllerEffect.PutCards.HAND, - LookLibraryControllerEffect.PutCards.GRAVEYARD + DomainValue.REGULAR, 2, PutCards.HAND, PutCards.GRAVEYARD )); this.getSpellAbility().addEffect(new LoseLifeSourceControllerEffect(2)); this.getSpellAbility().setAbilityWord(AbilityWord.DOMAIN); diff --git a/Mage.Sets/src/mage/cards/s/ShigekiJukaiVisionary.java b/Mage.Sets/src/mage/cards/s/ShigekiJukaiVisionary.java index 7a2cab81925..6a7a203f083 100644 --- a/Mage.Sets/src/mage/cards/s/ShigekiJukaiVisionary.java +++ b/Mage.Sets/src/mage/cards/s/ShigekiJukaiVisionary.java @@ -6,7 +6,6 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.ReturnToHandFromBattlefieldSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.abilities.keyword.ChannelAbility; diff --git a/Mage.Sets/src/mage/cards/s/ShimmerOfPossibility.java b/Mage.Sets/src/mage/cards/s/ShimmerOfPossibility.java index 9cd5ddfc375..a04798600e2 100644 --- a/Mage.Sets/src/mage/cards/s/ShimmerOfPossibility.java +++ b/Mage.Sets/src/mage/cards/s/ShimmerOfPossibility.java @@ -1,10 +1,10 @@ package mage.cards.s; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/s/SigardaChampionOfLight.java b/Mage.Sets/src/mage/cards/s/SigardaChampionOfLight.java index b56554d104b..8fcce8965a0 100644 --- a/Mage.Sets/src/mage/cards/s/SigardaChampionOfLight.java +++ b/Mage.Sets/src/mage/cards/s/SigardaChampionOfLight.java @@ -6,7 +6,6 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CovenCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.hint.common.CovenHint; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/cards/s/SightBeyondSight.java b/Mage.Sets/src/mage/cards/s/SightBeyondSight.java index 3fe8b4a48e1..d83d487654e 100644 --- a/Mage.Sets/src/mage/cards/s/SightBeyondSight.java +++ b/Mage.Sets/src/mage/cards/s/SightBeyondSight.java @@ -2,11 +2,11 @@ package mage.cards.s; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.ReboundAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; /** * diff --git a/Mage.Sets/src/mage/cards/s/SilhanaWayfinder.java b/Mage.Sets/src/mage/cards/s/SilhanaWayfinder.java index 9b8114685b9..7bf1c57776a 100644 --- a/Mage.Sets/src/mage/cards/s/SilhanaWayfinder.java +++ b/Mage.Sets/src/mage/cards/s/SilhanaWayfinder.java @@ -3,10 +3,10 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/s/SilundiVision.java b/Mage.Sets/src/mage/cards/s/SilundiVision.java index 463c0506526..3e6eae32877 100644 --- a/Mage.Sets/src/mage/cards/s/SilundiVision.java +++ b/Mage.Sets/src/mage/cards/s/SilundiVision.java @@ -2,11 +2,11 @@ package mage.cards.s; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardSetInfo; import mage.cards.ModalDoubleFacesCard; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/s/SilverbackElder.java b/Mage.Sets/src/mage/cards/s/SilverbackElder.java index d3fc8e35bf6..044b4434730 100644 --- a/Mage.Sets/src/mage/cards/s/SilverbackElder.java +++ b/Mage.Sets/src/mage/cards/s/SilverbackElder.java @@ -8,11 +8,11 @@ import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; -import mage.constants.SubType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; +import mage.constants.SubType; import mage.filter.StaticFilters; import mage.target.TargetPermanent; @@ -25,8 +25,7 @@ public final class SilverbackElder extends CardImpl { public SilverbackElder(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{G}{G}"); - this.subtype.add(SubType.APE); - this.subtype.add(SubType.SHAMAN); + this.subtype.add(SubType.APE, SubType.SHAMAN); this.power = new MageInt(5); this.toughness = new MageInt(7); @@ -37,8 +36,7 @@ public final class SilverbackElder extends CardImpl { // * Look at the top five cards of your library. You may put a land card from among them onto the battlefield tapped. Put the rest on the bottom of your library in a random order. ability.addMode(new Mode(new LookLibraryAndPickControllerEffect( - 5, 1, StaticFilters.FILTER_CARD_LAND, - LookLibraryControllerEffect.PutCards.BATTLEFIELD_TAPPED, LookLibraryControllerEffect.PutCards.BOTTOM_RANDOM + 5, 1, StaticFilters.FILTER_CARD_LAND, PutCards.BATTLEFIELD_TAPPED, PutCards.BOTTOM_RANDOM ))); // * You gain 4 life. diff --git a/Mage.Sets/src/mage/cards/s/SionaCaptainOfThePyleas.java b/Mage.Sets/src/mage/cards/s/SionaCaptainOfThePyleas.java index b1c6047c7e6..17a9d2520dd 100644 --- a/Mage.Sets/src/mage/cards/s/SionaCaptainOfThePyleas.java +++ b/Mage.Sets/src/mage/cards/s/SionaCaptainOfThePyleas.java @@ -5,13 +5,9 @@ import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; 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.constants.*; import mage.filter.FilterCard; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage.Sets/src/mage/cards/s/SkallaWolf.java b/Mage.Sets/src/mage/cards/s/SkallaWolf.java index c2ac49b9363..60b65114ff0 100644 --- a/Mage.Sets/src/mage/cards/s/SkallaWolf.java +++ b/Mage.Sets/src/mage/cards/s/SkallaWolf.java @@ -5,11 +5,11 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; -import mage.constants.SubType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; +import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; diff --git a/Mage.Sets/src/mage/cards/s/SleightOfHand.java b/Mage.Sets/src/mage/cards/s/SleightOfHand.java index bc85f30e586..89ade43e521 100644 --- a/Mage.Sets/src/mage/cards/s/SleightOfHand.java +++ b/Mage.Sets/src/mage/cards/s/SleightOfHand.java @@ -1,10 +1,10 @@ package mage.cards.s; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/s/SlimefootsSurvey.java b/Mage.Sets/src/mage/cards/s/SlimefootsSurvey.java index 2bfdd744c69..7debb87c95e 100644 --- a/Mage.Sets/src/mage/cards/s/SlimefootsSurvey.java +++ b/Mage.Sets/src/mage/cards/s/SlimefootsSurvey.java @@ -4,12 +4,12 @@ import java.util.UUID; import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.common.FilterLandCard; import mage.filter.predicate.Predicates; @@ -41,7 +41,7 @@ public final class SlimefootsSurvey extends CardImpl { this.getSpellAbility().setAbilityWord(AbilityWord.DOMAIN); this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, filter), true)); this.getSpellAbility().addEffect(new LookLibraryAndPickControllerEffect( - DomainValue.REGULAR, 1, LookLibraryControllerEffect.PutCards.TOP_ANY, LookLibraryControllerEffect.PutCards.BOTTOM_RANDOM, true + DomainValue.REGULAR, 1, PutCards.TOP_ANY, PutCards.BOTTOM_RANDOM, true )); } diff --git a/Mage.Sets/src/mage/cards/s/SoulcipherBoard.java b/Mage.Sets/src/mage/cards/s/SoulcipherBoard.java index 3566861d1b3..66aafa4875d 100644 --- a/Mage.Sets/src/mage/cards/s/SoulcipherBoard.java +++ b/Mage.Sets/src/mage/cards/s/SoulcipherBoard.java @@ -10,7 +10,6 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.counter.RemoveCounterSourceEffect; @@ -18,6 +17,7 @@ import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/s/StoneforgeAcolyte.java b/Mage.Sets/src/mage/cards/s/StoneforgeAcolyte.java index 01aa39b17ca..4077566f2b6 100644 --- a/Mage.Sets/src/mage/cards/s/StoneforgeAcolyte.java +++ b/Mage.Sets/src/mage/cards/s/StoneforgeAcolyte.java @@ -8,11 +8,11 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/s/StormTheFestival.java b/Mage.Sets/src/mage/cards/s/StormTheFestival.java index 921184cec88..10c33fcfd89 100644 --- a/Mage.Sets/src/mage/cards/s/StormTheFestival.java +++ b/Mage.Sets/src/mage/cards/s/StormTheFestival.java @@ -2,12 +2,12 @@ package mage.cards.s; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ManaValuePredicate; diff --git a/Mage.Sets/src/mage/cards/s/StrategicPlanning.java b/Mage.Sets/src/mage/cards/s/StrategicPlanning.java index 1a20bb62d75..4fdaba4639a 100644 --- a/Mage.Sets/src/mage/cards/s/StrategicPlanning.java +++ b/Mage.Sets/src/mage/cards/s/StrategicPlanning.java @@ -2,10 +2,10 @@ package mage.cards.s; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; /** * diff --git a/Mage.Sets/src/mage/cards/s/SultaiAscendancy.java b/Mage.Sets/src/mage/cards/s/SultaiAscendancy.java index abacba8a0e9..393db3acd28 100644 --- a/Mage.Sets/src/mage/cards/s/SultaiAscendancy.java +++ b/Mage.Sets/src/mage/cards/s/SultaiAscendancy.java @@ -3,10 +3,10 @@ package mage.cards.s; import java.util.UUID; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.TargetController; /** diff --git a/Mage.Sets/src/mage/cards/s/SultaiSoothsayer.java b/Mage.Sets/src/mage/cards/s/SultaiSoothsayer.java index 1bf2e150147..8b5d7af0ed6 100644 --- a/Mage.Sets/src/mage/cards/s/SultaiSoothsayer.java +++ b/Mage.Sets/src/mage/cards/s/SultaiSoothsayer.java @@ -4,10 +4,10 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; /** diff --git a/Mage.Sets/src/mage/cards/s/SumalaWoodshaper.java b/Mage.Sets/src/mage/cards/s/SumalaWoodshaper.java index aac25d74ece..ee2d8b466c7 100644 --- a/Mage.Sets/src/mage/cards/s/SumalaWoodshaper.java +++ b/Mage.Sets/src/mage/cards/s/SumalaWoodshaper.java @@ -3,10 +3,10 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; diff --git a/Mage.Sets/src/mage/cards/s/SummoningTrap.java b/Mage.Sets/src/mage/cards/s/SummoningTrap.java index 0b6ac70ec7a..e9307e9c36a 100644 --- a/Mage.Sets/src/mage/cards/s/SummoningTrap.java +++ b/Mage.Sets/src/mage/cards/s/SummoningTrap.java @@ -6,7 +6,6 @@ import mage.abilities.condition.Condition; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; diff --git a/Mage.Sets/src/mage/cards/s/SupremeWill.java b/Mage.Sets/src/mage/cards/s/SupremeWill.java index d7c70baa919..78f66d0356d 100644 --- a/Mage.Sets/src/mage/cards/s/SupremeWill.java +++ b/Mage.Sets/src/mage/cards/s/SupremeWill.java @@ -5,10 +5,10 @@ import mage.abilities.Mode; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.target.TargetSpell; /** diff --git a/Mage.Sets/src/mage/cards/t/TaigamSidisisHand.java b/Mage.Sets/src/mage/cards/t/TaigamSidisisHand.java index b7a40e13288..3ef1cf100ee 100644 --- a/Mage.Sets/src/mage/cards/t/TaigamSidisisHand.java +++ b/Mage.Sets/src/mage/cards/t/TaigamSidisisHand.java @@ -13,7 +13,6 @@ import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.GetXValue; import mage.abilities.dynamicvalue.common.SignInversionDynamicValue; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.SkipDrawStepEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/cards/t/TaigamsScheming.java b/Mage.Sets/src/mage/cards/t/TaigamsScheming.java index 746d8cf2e05..f65c44bd496 100644 --- a/Mage.Sets/src/mage/cards/t/TaigamsScheming.java +++ b/Mage.Sets/src/mage/cards/t/TaigamsScheming.java @@ -2,10 +2,10 @@ package mage.cards.t; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; /** * diff --git a/Mage.Sets/src/mage/cards/t/TalasLookout.java b/Mage.Sets/src/mage/cards/t/TalasLookout.java index bb2e5e5b7e7..32e3c65b3ca 100644 --- a/Mage.Sets/src/mage/cards/t/TalasLookout.java +++ b/Mage.Sets/src/mage/cards/t/TalasLookout.java @@ -3,11 +3,11 @@ package mage.cards.t; import mage.MageInt; import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import java.util.UUID; @@ -20,8 +20,7 @@ public final class TalasLookout extends CardImpl { public TalasLookout(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}{U}"); - this.subtype.add(SubType.HUMAN); - this.subtype.add(SubType.PIRATE); + this.subtype.add(SubType.HUMAN, SubType.PIRATE); this.power = new MageInt(3); this.toughness = new MageInt(2); @@ -30,9 +29,7 @@ public final class TalasLookout extends CardImpl { // When Talas Lookout dies, look at the top two cards of your library. Put one of them into your hand and the other into your graveyard. this.addAbility(new DiesSourceTriggeredAbility(new LookLibraryAndPickControllerEffect( - 2, 1, - LookLibraryControllerEffect.PutCards.HAND, - LookLibraryControllerEffect.PutCards.GRAVEYARD + 2, 1, PutCards.HAND, PutCards.GRAVEYARD ))); } diff --git a/Mage.Sets/src/mage/cards/t/TappingAtTheWindow.java b/Mage.Sets/src/mage/cards/t/TappingAtTheWindow.java index 6e0604fc50e..3ecdc4a9e9f 100644 --- a/Mage.Sets/src/mage/cards/t/TappingAtTheWindow.java +++ b/Mage.Sets/src/mage/cards/t/TappingAtTheWindow.java @@ -2,11 +2,11 @@ package mage.cards.t; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/t/TazriBeaconOfUnity.java b/Mage.Sets/src/mage/cards/t/TazriBeaconOfUnity.java index f38d11082a1..5509d07f4af 100644 --- a/Mage.Sets/src/mage/cards/t/TazriBeaconOfUnity.java +++ b/Mage.Sets/src/mage/cards/t/TazriBeaconOfUnity.java @@ -8,7 +8,6 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.PartyCount; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.cost.SpellCostReductionForEachSourceEffect; import mage.abilities.hint.common.PartyCountHint; import mage.constants.SubType; @@ -16,6 +15,7 @@ import mage.constants.SuperType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; diff --git a/Mage.Sets/src/mage/cards/t/TeferiTemporalArchmage.java b/Mage.Sets/src/mage/cards/t/TeferiTemporalArchmage.java index cf3a8b8610d..9432e7c8eaf 100644 --- a/Mage.Sets/src/mage/cards/t/TeferiTemporalArchmage.java +++ b/Mage.Sets/src/mage/cards/t/TeferiTemporalArchmage.java @@ -5,11 +5,11 @@ import mage.abilities.LoyaltyAbility; import mage.abilities.common.CanBeYourCommanderAbility; import mage.abilities.effects.common.GetEmblemEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.UntapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/cards/t/TeferiWhoSlowsTheSunset.java b/Mage.Sets/src/mage/cards/t/TeferiWhoSlowsTheSunset.java index 58a0e3f0603..35b79ac36bc 100644 --- a/Mage.Sets/src/mage/cards/t/TeferiWhoSlowsTheSunset.java +++ b/Mage.Sets/src/mage/cards/t/TeferiWhoSlowsTheSunset.java @@ -6,13 +6,9 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.GetEmblemEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; 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.constants.*; import mage.game.Game; import mage.game.command.emblems.TeferiWhoSlowsTheSunsetEmblem; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/t/TezzeretAgentOfBolas.java b/Mage.Sets/src/mage/cards/t/TezzeretAgentOfBolas.java index f1e9fa9c913..1e6edebc8d2 100644 --- a/Mage.Sets/src/mage/cards/t/TezzeretAgentOfBolas.java +++ b/Mage.Sets/src/mage/cards/t/TezzeretAgentOfBolas.java @@ -8,16 +8,11 @@ import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.continuous.AddCardTypeTargetEffect; import mage.abilities.effects.common.continuous.SetBasePowerToughnessTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.SubType; -import mage.constants.SuperType; +import mage.constants.*; import mage.filter.StaticFilters; import mage.game.Game; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/t/TezzeretsGatebreaker.java b/Mage.Sets/src/mage/cards/t/TezzeretsGatebreaker.java index bb256ce107c..4a3282abed6 100644 --- a/Mage.Sets/src/mage/cards/t/TezzeretsGatebreaker.java +++ b/Mage.Sets/src/mage/cards/t/TezzeretsGatebreaker.java @@ -9,12 +9,12 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.combat.CantBeBlockedAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.filter.predicate.Predicates; diff --git a/Mage.Sets/src/mage/cards/t/ThassasIntervention.java b/Mage.Sets/src/mage/cards/t/ThassasIntervention.java index 55a5ba1b9fe..25f59fe9797 100644 --- a/Mage.Sets/src/mage/cards/t/ThassasIntervention.java +++ b/Mage.Sets/src/mage/cards/t/ThassasIntervention.java @@ -6,10 +6,10 @@ import mage.abilities.dynamicvalue.MultipliedValue; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.target.TargetSpell; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/t/TheAntiquitiesWar.java b/Mage.Sets/src/mage/cards/t/TheAntiquitiesWar.java index 1c6cab3ae01..31eda156c7e 100644 --- a/Mage.Sets/src/mage/cards/t/TheAntiquitiesWar.java +++ b/Mage.Sets/src/mage/cards/t/TheAntiquitiesWar.java @@ -6,16 +6,9 @@ import mage.abilities.Ability; import mage.abilities.common.SagaAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SagaChapter; -import mage.constants.SubLayer; -import mage.constants.SubType; +import mage.constants.*; import mage.filter.StaticFilters; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/t/TheLadyOfOtaria.java b/Mage.Sets/src/mage/cards/t/TheLadyOfOtaria.java index bcf7ed50a05..8c20252f586 100644 --- a/Mage.Sets/src/mage/cards/t/TheLadyOfOtaria.java +++ b/Mage.Sets/src/mage/cards/t/TheLadyOfOtaria.java @@ -6,7 +6,6 @@ import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.common.TapTargetCost; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.abilities.hint.ConditionHint; import mage.abilities.hint.Hint; @@ -56,9 +55,7 @@ public final class TheLadyOfOtaria extends CardImpl { // At the beginning of each end step, if a land you controlled was put into your graveyard from the battlefield this turn, reveal the top four cards of your library. Put any number of Dwarf cards from among them into your hand and the rest on the bottom of your library in a random order. this.addAbility(new BeginningOfEndStepTriggeredAbility( new RevealLibraryPickControllerEffect( - 4, Integer.MAX_VALUE, filter2, - LookLibraryControllerEffect.PutCards.HAND, - LookLibraryControllerEffect.PutCards.BOTTOM_RANDOM, false + 4, Integer.MAX_VALUE, filter2, PutCards.HAND, PutCards.BOTTOM_RANDOM, false ), TargetController.ANY, TheLadyOfOtariaCondition.instance, false ).addHint(TheLadyOfOtariaCondition.getHint()), new TheLadyOfOtariaWatcher()); } diff --git a/Mage.Sets/src/mage/cards/t/TheManaRig.java b/Mage.Sets/src/mage/cards/t/TheManaRig.java index 13a43be6bfc..d23874edc8d 100644 --- a/Mage.Sets/src/mage/cards/t/TheManaRig.java +++ b/Mage.Sets/src/mage/cards/t/TheManaRig.java @@ -8,10 +8,10 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SuperType; import mage.filter.StaticFilters; import mage.game.permanent.token.PowerstoneToken; diff --git a/Mage.Sets/src/mage/cards/t/TheWorldSpell.java b/Mage.Sets/src/mage/cards/t/TheWorldSpell.java index 1a80a6965fa..7323cf7679e 100644 --- a/Mage.Sets/src/mage/cards/t/TheWorldSpell.java +++ b/Mage.Sets/src/mage/cards/t/TheWorldSpell.java @@ -4,7 +4,6 @@ import mage.abilities.Ability; import mage.abilities.common.SagaAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.CardsImpl; @@ -41,9 +40,7 @@ public final class TheWorldSpell extends CardImpl { sagaAbility.addChapterEffect( this, SagaChapter.CHAPTER_I, SagaChapter.CHAPTER_II, new LookLibraryAndPickControllerEffect( - 7, 1, filter, - LookLibraryControllerEffect.PutCards.HAND, - LookLibraryControllerEffect.PutCards.BOTTOM_RANDOM + 7, 1, filter, PutCards.HAND, PutCards.BOTTOM_RANDOM ) ); diff --git a/Mage.Sets/src/mage/cards/t/ThievesFortune.java b/Mage.Sets/src/mage/cards/t/ThievesFortune.java index 27e9fdf5779..7c1a96d588a 100644 --- a/Mage.Sets/src/mage/cards/t/ThievesFortune.java +++ b/Mage.Sets/src/mage/cards/t/ThievesFortune.java @@ -2,11 +2,11 @@ package mage.cards.t; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.ProwlAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; /** diff --git a/Mage.Sets/src/mage/cards/t/TomorrowAzamisFamiliar.java b/Mage.Sets/src/mage/cards/t/TomorrowAzamisFamiliar.java index a054f43c034..60effa21f51 100644 --- a/Mage.Sets/src/mage/cards/t/TomorrowAzamisFamiliar.java +++ b/Mage.Sets/src/mage/cards/t/TomorrowAzamisFamiliar.java @@ -6,7 +6,6 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; diff --git a/Mage.Sets/src/mage/cards/t/TorstenFounderOfBenalia.java b/Mage.Sets/src/mage/cards/t/TorstenFounderOfBenalia.java index ddf558ab828..b5968a71f8b 100644 --- a/Mage.Sets/src/mage/cards/t/TorstenFounderOfBenalia.java +++ b/Mage.Sets/src/mage/cards/t/TorstenFounderOfBenalia.java @@ -4,11 +4,11 @@ import mage.MageInt; import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterCard; @@ -35,16 +35,13 @@ public final class TorstenFounderOfBenalia extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{G}{W}"); this.addSuperType(SuperType.LEGENDARY); - this.subtype.add(SubType.HUMAN); - this.subtype.add(SubType.SOLDIER); + this.subtype.add(SubType.HUMAN, SubType.SOLDIER); this.power = new MageInt(7); this.toughness = new MageInt(7); // When Torsten, Founder of Benalia enters the battlefield, reveal the top seven cards of your library. Put any number of creature and/or land cards from among them into your hand and the rest on the bottom of your library in a random order. this.addAbility(new EntersBattlefieldTriggeredAbility(new RevealLibraryPickControllerEffect( - 7, Integer.MAX_VALUE, filter, - LookLibraryControllerEffect.PutCards.HAND, - LookLibraryControllerEffect.PutCards.BOTTOM_RANDOM, false + 7, Integer.MAX_VALUE, filter, PutCards.HAND, PutCards.BOTTOM_RANDOM, false ))); // When Torsten dies, create seven 1/1 white Soldier creature tokens. diff --git a/Mage.Sets/src/mage/cards/t/TowerGeist.java b/Mage.Sets/src/mage/cards/t/TowerGeist.java index 1e6b89582e6..8181684d4a4 100644 --- a/Mage.Sets/src/mage/cards/t/TowerGeist.java +++ b/Mage.Sets/src/mage/cards/t/TowerGeist.java @@ -33,11 +33,11 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; /** diff --git a/Mage.Sets/src/mage/cards/t/TrackersInstincts.java b/Mage.Sets/src/mage/cards/t/TrackersInstincts.java index 2bc1425fee0..4292b415ad8 100644 --- a/Mage.Sets/src/mage/cards/t/TrackersInstincts.java +++ b/Mage.Sets/src/mage/cards/t/TrackersInstincts.java @@ -2,12 +2,12 @@ package mage.cards.t; import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; /** diff --git a/Mage.Sets/src/mage/cards/t/TrailOfCrumbs.java b/Mage.Sets/src/mage/cards/t/TrailOfCrumbs.java index 1542e0cc212..7f6ba0f9ead 100644 --- a/Mage.Sets/src/mage/cards/t/TrailOfCrumbs.java +++ b/Mage.Sets/src/mage/cards/t/TrailOfCrumbs.java @@ -6,10 +6,10 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/u/UncoveredClues.java b/Mage.Sets/src/mage/cards/u/UncoveredClues.java index 976afa743f2..37127b7ba2d 100644 --- a/Mage.Sets/src/mage/cards/u/UncoveredClues.java +++ b/Mage.Sets/src/mage/cards/u/UncoveredClues.java @@ -2,10 +2,10 @@ package mage.cards.u; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.common.FilterInstantOrSorceryCard; diff --git a/Mage.Sets/src/mage/cards/u/UnderrealmLich.java b/Mage.Sets/src/mage/cards/u/UnderrealmLich.java index 1ca93be83fd..4ef262a38d3 100644 --- a/Mage.Sets/src/mage/cards/u/UnderrealmLich.java +++ b/Mage.Sets/src/mage/cards/u/UnderrealmLich.java @@ -8,7 +8,6 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.IndestructibleAbility; @@ -18,6 +17,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; +import mage.constants.PutCards; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage.Sets/src/mage/cards/u/UnityOfTheDroids.java b/Mage.Sets/src/mage/cards/u/UnityOfTheDroids.java index 381930217f4..75da54f62b6 100644 --- a/Mage.Sets/src/mage/cards/u/UnityOfTheDroids.java +++ b/Mage.Sets/src/mage/cards/u/UnityOfTheDroids.java @@ -4,12 +4,12 @@ import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; 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.PutCards; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/u/UrzaAcademyHeadmaster.java b/Mage.Sets/src/mage/cards/u/UrzaAcademyHeadmaster.java index 5e24861e04c..b90f59fcaee 100644 --- a/Mage.Sets/src/mage/cards/u/UrzaAcademyHeadmaster.java +++ b/Mage.Sets/src/mage/cards/u/UrzaAcademyHeadmaster.java @@ -10,7 +10,6 @@ import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.*; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.continuous.*; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.counter.DistributeCountersEffect; diff --git a/Mage.Sets/src/mage/cards/v/VesselOfNascency.java b/Mage.Sets/src/mage/cards/v/VesselOfNascency.java index e1ac0ee88df..4d4e9b1f011 100644 --- a/Mage.Sets/src/mage/cards/v/VesselOfNascency.java +++ b/Mage.Sets/src/mage/cards/v/VesselOfNascency.java @@ -5,11 +5,11 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; diff --git a/Mage.Sets/src/mage/cards/v/VineshaperProdigy.java b/Mage.Sets/src/mage/cards/v/VineshaperProdigy.java index fb3ce6f2ee2..a63902054cb 100644 --- a/Mage.Sets/src/mage/cards/v/VineshaperProdigy.java +++ b/Mage.Sets/src/mage/cards/v/VineshaperProdigy.java @@ -5,11 +5,11 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.keyword.KickerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import java.util.UUID; @@ -22,8 +22,7 @@ public final class VineshaperProdigy extends CardImpl { public VineshaperProdigy(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}"); - this.subtype.add(SubType.ELF); - this.subtype.add(SubType.DRUID); + this.subtype.add(SubType.ELF, SubType.DRUID); this.power = new MageInt(2); this.toughness = new MageInt(2); @@ -34,9 +33,7 @@ public final class VineshaperProdigy extends CardImpl { this.addAbility(new ConditionalInterveningIfTriggeredAbility( new EntersBattlefieldTriggeredAbility( new LookLibraryAndPickControllerEffect( - 3, 1, - LookLibraryControllerEffect.PutCards.HAND, - LookLibraryControllerEffect.PutCards.BOTTOM_ANY + 3, 1, PutCards.HAND, PutCards.BOTTOM_ANY )), KickedCondition.ONCE, "When {this} enters the battlefield, " + "if it was kicked, look at the top three cards of your library. " + "Put one of them into your hand and the rest on the bottom of your library in any order." diff --git a/Mage.Sets/src/mage/cards/v/VivienReid.java b/Mage.Sets/src/mage/cards/v/VivienReid.java index afc38b1b9c2..960d5c343ae 100644 --- a/Mage.Sets/src/mage/cards/v/VivienReid.java +++ b/Mage.Sets/src/mage/cards/v/VivienReid.java @@ -6,13 +6,13 @@ import mage.abilities.LoyaltyAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.GetEmblemEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlyingAbility; import mage.constants.SubType; import mage.constants.SuperType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; diff --git a/Mage.Sets/src/mage/cards/v/VodaSeaScavenger.java b/Mage.Sets/src/mage/cards/v/VodaSeaScavenger.java index b706aea96a3..6b454003982 100644 --- a/Mage.Sets/src/mage/cards/v/VodaSeaScavenger.java +++ b/Mage.Sets/src/mage/cards/v/VodaSeaScavenger.java @@ -4,12 +4,12 @@ import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.hint.common.DomainHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import java.util.UUID; @@ -22,15 +22,13 @@ public final class VodaSeaScavenger extends CardImpl { public VodaSeaScavenger(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}"); - this.subtype.add(SubType.MERFOLK); - this.subtype.add(SubType.ROGUE); + this.subtype.add(SubType.MERFOLK, SubType.ROGUE); this.power = new MageInt(3); this.toughness = new MageInt(2); // Domain — When Voda Sea Scavenger enters the battlefield, look at the top card X cards of your library, where X is the number of basic land types among lands you control. You may put one of those cards on top of your library. Put the rest on the bottom of your library in a random order. this.addAbility(new EntersBattlefieldTriggeredAbility(new LookLibraryAndPickControllerEffect( - DomainValue.REGULAR, 1, LookLibraryControllerEffect.PutCards.TOP_ANY, - LookLibraryControllerEffect.PutCards.BOTTOM_RANDOM, true + DomainValue.REGULAR, 1, PutCards.TOP_ANY, PutCards.BOTTOM_RANDOM, true )).setAbilityWord(AbilityWord.DOMAIN).addHint(DomainHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/w/WakerOfWaves.java b/Mage.Sets/src/mage/cards/w/WakerOfWaves.java index 69f2dcc76d0..a070f21937a 100644 --- a/Mage.Sets/src/mage/cards/w/WakerOfWaves.java +++ b/Mage.Sets/src/mage/cards/w/WakerOfWaves.java @@ -7,7 +7,6 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.DiscardSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; diff --git a/Mage.Sets/src/mage/cards/w/WanderingMind.java b/Mage.Sets/src/mage/cards/w/WanderingMind.java index bea533fceaf..b2d457d6261 100644 --- a/Mage.Sets/src/mage/cards/w/WanderingMind.java +++ b/Mage.Sets/src/mage/cards/w/WanderingMind.java @@ -3,11 +3,11 @@ package mage.cards.w; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterNonlandCard; diff --git a/Mage.Sets/src/mage/cards/w/WarlockClass.java b/Mage.Sets/src/mage/cards/w/WarlockClass.java index a4e89a1e33d..7ed4220adb7 100644 --- a/Mage.Sets/src/mage/cards/w/WarlockClass.java +++ b/Mage.Sets/src/mage/cards/w/WarlockClass.java @@ -8,7 +8,6 @@ import mage.abilities.condition.common.MorbidCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.LoseLifeOpponentsEffect; import mage.abilities.effects.common.continuous.GainClassAbilitySourceEffect; import mage.abilities.hint.common.MorbidHint; diff --git a/Mage.Sets/src/mage/cards/w/WarmWelcome.java b/Mage.Sets/src/mage/cards/w/WarmWelcome.java index 7627fdd79f4..04d8a1c77a3 100644 --- a/Mage.Sets/src/mage/cards/w/WarmWelcome.java +++ b/Mage.Sets/src/mage/cards/w/WarmWelcome.java @@ -2,10 +2,10 @@ package mage.cards.w; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; import mage.game.permanent.token.CitizenGreenWhiteToken; diff --git a/Mage.Sets/src/mage/cards/w/Weatherlight.java b/Mage.Sets/src/mage/cards/w/Weatherlight.java index a88e76e3a28..07a5dc0217a 100644 --- a/Mage.Sets/src/mage/cards/w/Weatherlight.java +++ b/Mage.Sets/src/mage/cards/w/Weatherlight.java @@ -3,12 +3,12 @@ package mage.cards.w; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.CrewAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/cards/w/WildsongHowler.java b/Mage.Sets/src/mage/cards/w/WildsongHowler.java index 263b258493f..dad0a4f2a96 100644 --- a/Mage.Sets/src/mage/cards/w/WildsongHowler.java +++ b/Mage.Sets/src/mage/cards/w/WildsongHowler.java @@ -3,11 +3,11 @@ package mage.cards.w; import mage.MageInt; import mage.abilities.common.TransformsOrEntersTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.NightboundAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/w/WitnessTheFuture.java b/Mage.Sets/src/mage/cards/w/WitnessTheFuture.java index 8f994100c71..e744bc7ed0f 100644 --- a/Mage.Sets/src/mage/cards/w/WitnessTheFuture.java +++ b/Mage.Sets/src/mage/cards/w/WitnessTheFuture.java @@ -3,11 +3,11 @@ package mage.cards.w; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.TargetPlayerShufflesTargetCardsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.target.TargetPlayer; import mage.target.common.TargetCardInTargetPlayersGraveyard; diff --git a/Mage.Sets/src/mage/cards/y/YodaJediMaster.java b/Mage.Sets/src/mage/cards/y/YodaJediMaster.java index b8e80a18156..fb319fb2ab9 100644 --- a/Mage.Sets/src/mage/cards/y/YodaJediMaster.java +++ b/Mage.Sets/src/mage/cards/y/YodaJediMaster.java @@ -1,4 +1,3 @@ - package mage.cards.y; import java.util.UUID; @@ -9,15 +8,10 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.GetEmblemEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.SuperType; -import mage.constants.Outcome; -import mage.constants.TargetController; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/y/YouMeetInATavern.java b/Mage.Sets/src/mage/cards/y/YouMeetInATavern.java index 60ccfa10dad..898d97196a7 100644 --- a/Mage.Sets/src/mage/cards/y/YouMeetInATavern.java +++ b/Mage.Sets/src/mage/cards/y/YouMeetInATavern.java @@ -2,12 +2,12 @@ package mage.cards.y; import mage.abilities.Mode; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.PutCards; import mage.filter.StaticFilters; import java.util.UUID; diff --git a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java index c2fbfd25086..c9027aa18b4 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java @@ -35,6 +35,7 @@ import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.PutCards; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.StaticFilters; @@ -157,12 +158,12 @@ public class LookLibraryAndPickControllerEffect extends LookLibraryControllerEff sb.append(plural ? "them" : "it"); } sb.append(" "); - sb.append(putPickedCards.getMessage(plural)); + sb.append(putPickedCards.getMessage(false, plural)); return sb.append("?").toString(); } protected String getChooseHint() { - return "to put " + putPickedCards.getMessage(numberToPick > 1); + return "to put " + putPickedCards.getMessage(false, numberToPick > 1); } @Override @@ -201,7 +202,7 @@ public class LookLibraryAndPickControllerEffect extends LookLibraryControllerEff sb.append("and put "); sb.append(plural ? "them " : "it "); } - sb.append(putPickedCards.getMessage(plural)); + sb.append(putPickedCards.getMessage(false, plural)); plural = optional || upTo @@ -218,7 +219,7 @@ public class LookLibraryAndPickControllerEffect extends LookLibraryControllerEff if (putPickedCards == PutCards.GRAVEYARD && putLookedCards == PutCards.TOP_ANY) { sb.append("back "); } - sb.append(putLookedCards.getMessage(plural)); + sb.append(putLookedCards.getMessage(false, plural)); // get text frame from super class and inject action text return setText(mode, sb.toString()); diff --git a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryControllerEffect.java index 45361da3071..e4c3e953571 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryControllerEffect.java @@ -9,6 +9,7 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.Cards; import mage.cards.CardsImpl; import mage.constants.Outcome; +import mage.constants.PutCards; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; @@ -20,44 +21,6 @@ import mage.util.CardUtil; */ public class LookLibraryControllerEffect extends OneShotEffect { - public enum PutCards { - HAND(Outcome.DrawCard, Zone.HAND, "into your hand"), - GRAVEYARD(Outcome.Discard, Zone.GRAVEYARD, "into your graveyard"), - BATTLEFIELD(Outcome.PutCardInPlay, Zone.BATTLEFIELD, "onto the battlefield"), - BATTLEFIELD_TAPPED(Outcome.PutCardInPlay, Zone.BATTLEFIELD, "onto the battlefield tapped"), - TOP_ANY(Outcome.Benefit, Zone.LIBRARY, "on top of your library", " in any order"), - BOTTOM_ANY(Outcome.Benefit, Zone.LIBRARY, "on the bottom of your library", " in any order"), - BOTTOM_RANDOM(Outcome.Benefit, Zone.LIBRARY, "on the bottom of your library", " in a random order"); - - private final Outcome outcome; - private final Zone zone; - private final String message; - private final String order; - - PutCards(Outcome outcome, Zone zone, String message) { - this(outcome, zone, message, ""); - } - - PutCards(Outcome outcome, Zone zone, String message, String order) { - this.outcome = outcome; - this.zone = zone; - this.message = message; - this.order = order; - } - - public Outcome getOutcome() { - return outcome; - } - - public Zone getZone() { - return zone; - } - - public String getMessage(boolean withOrder) { - return withOrder ? message + order : message; - } - } - protected DynamicValue numberOfCards; protected PutCards putLookedCards; protected boolean revealCards; @@ -167,7 +130,7 @@ public class LookLibraryControllerEffect extends OneShotEffect { sb.append(middleText); } else if (!oneCard) { sb.append(", then put them "); - sb.append(putLookedCards == PutCards.TOP_ANY ? "back in any order" : putLookedCards.getMessage(true)); + sb.append(putLookedCards == PutCards.TOP_ANY ? "back in any order" : putLookedCards.getMessage(false, true)); } return sb.toString(); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/RevealLibraryPickControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RevealLibraryPickControllerEffect.java index e6df716914e..8170f8dfa4b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/RevealLibraryPickControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/RevealLibraryPickControllerEffect.java @@ -1,5 +1,6 @@ package mage.abilities.effects.common; +import mage.constants.PutCards; import mage.filter.FilterCard; /** diff --git a/Mage/src/main/java/mage/constants/PutCards.java b/Mage/src/main/java/mage/constants/PutCards.java new file mode 100644 index 00000000000..e5c1edabaff --- /dev/null +++ b/Mage/src/main/java/mage/constants/PutCards.java @@ -0,0 +1,49 @@ +package mage.constants; + +/** + * + * @author awjackson + */ + +public enum PutCards { + HAND(Outcome.DrawCard, Zone.HAND, "into your hand"), + GRAVEYARD(Outcome.Discard, Zone.GRAVEYARD, "into your graveyard"), + BATTLEFIELD(Outcome.PutCardInPlay, Zone.BATTLEFIELD, "onto the battlefield"), + BATTLEFIELD_TAPPED(Outcome.PutCardInPlay, Zone.BATTLEFIELD, "onto the battlefield tapped"), + EXILED(Outcome.Exile, Zone.EXILED, "into exile"), // may need special case code to generate correct text + TOP_OR_BOTTOM(Outcome.Benefit, Zone.LIBRARY, "on the top or bottom of your library"), + TOP_ANY(Outcome.Benefit, Zone.LIBRARY, "on top of your library", " in any order"), + BOTTOM_ANY(Outcome.Benefit, Zone.LIBRARY, "on the bottom of your library", " in any order"), + BOTTOM_RANDOM(Outcome.Benefit, Zone.LIBRARY, "on the bottom of your library", " in a random order"); + + private final Outcome outcome; + private final Zone zone; + private final String messageYour; + private final String messageOwner; + private final String order; + + PutCards(Outcome outcome, Zone zone, String message) { + this(outcome, zone, message, ""); + } + + PutCards(Outcome outcome, Zone zone, String message, String order) { + this.outcome = outcome; + this.zone = zone; + this.messageYour = message; + this.messageOwner = message.replace("your", "its owner's"); + this.order = order; + } + + public Outcome getOutcome() { + return outcome; + } + + public Zone getZone() { + return zone; + } + + public String getMessage(boolean owner, boolean withOrder) { + String message = owner ? messageOwner : messageYour; + return withOrder ? message + order : message; + } +} diff --git a/Mage/src/main/java/mage/target/common/TargetLandPermanent.java b/Mage/src/main/java/mage/target/common/TargetLandPermanent.java index a0c69ef1ab7..98bb12c0908 100644 --- a/Mage/src/main/java/mage/target/common/TargetLandPermanent.java +++ b/Mage/src/main/java/mage/target/common/TargetLandPermanent.java @@ -12,7 +12,7 @@ import mage.target.TargetPermanent; public class TargetLandPermanent extends TargetPermanent { public TargetLandPermanent() { - this(1, 1, StaticFilters.FILTER_LAND, false); + this(1); } public TargetLandPermanent(FilterLandPermanent filter) { @@ -20,11 +20,11 @@ public class TargetLandPermanent extends TargetPermanent { } public TargetLandPermanent(int numTargets) { - this(numTargets, numTargets, StaticFilters.FILTER_LAND, false); + this(numTargets, numTargets); } public TargetLandPermanent(int numTargets, int maxNumTargets) { - this(numTargets, maxNumTargets, StaticFilters.FILTER_LAND, false); + this(numTargets, maxNumTargets, maxNumTargets > 1 ? StaticFilters.FILTER_LANDS : StaticFilters.FILTER_LAND, false); } public TargetLandPermanent(int minNumTargets, int maxNumTargets, FilterLandPermanent filter, boolean notTarget) {